git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] "master" should be treated no differently from any other branch

From
Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date
Dec 14, 2006, 18:35 UTC
Message-ID
<200612141935.49776.robin.rosenberg.lists@dewire.com>
In-Reply-To
<20061214174251.GA16819@tuxdriver.com>
torsdag 14 december 2006 18:42 skrev John W. Linville:
Show 14 quoted lines
> On Thu, Dec 14, 2006 at 03:19:44PM +0000, Andy Parkins wrote:
> > This patch makes all merge log messages of the form:
> >
> >   Merge branch XXXX into YYYY
> >
> > Regardless of whether YYYY is master or not.
> >
> > "master" shouldn't get special treatment; making different log messages
> > based on the name of the branch is bad form.  What if a user likes
> > "my/master" or "my/head" as their master branch?
>
> Why not drop the "into YYYY" part for everyone else?  I don't find
> it useful at all, and is just confusing if I merge to a temporary
> branch and then pull that into master later.

Or just drop both the from, into and repo names.. A commit may come from a certain repo, buy you would never know since it may have been pulled there rather than committed, so the merge message is misleading and if the merge was a fast forward you wouldn't see a merge message at all.

To make everybody happy, the .git/config could contain a template that states the project policy on merge commits.

Obviously the person executing the merge is free to amend the merge message, insertering synthetic commits or whatever he/she sees fit.

Previous: John W. LinvilleNext: Junio C Hamano
Message 15 of 21 in “"master" should be treated no differently from any other branch”
  1. "master" should be treated no differently from any other branchAndy Parkins, Dec 14, 2006
  2. Johannes SchindelinDec 14, 2006
  3. Han-Wen NienhuysDec 14, 2006
  4. Johannes SchindelinDec 14, 2006
  5. Han-Wen NienhuysDec 14, 2006
  6. Johannes SchindelinDec 14, 2006
  7. Jakub NarebskiDec 15, 2006
  8. Nicolas PitreDec 14, 2006
  9. Jerome LovyDec 14, 2006
  10. Junio C HamanoDec 15, 2006
  11. Andy ParkinsDec 14, 2006
  12. Andy ParkinsDec 14, 2006
  13. Johannes SchindelinDec 14, 2006
  14. John W. LinvilleDec 14, 2006
  15. Robin RosenbergDec 14, 2006
  16. Junio C HamanoDec 14, 2006
  17. Andy ParkinsDec 14, 2006
  18. Junio C HamanoDec 14, 2006
  19. Andy ParkinsDec 14, 2006
  20. Shawn PearceDec 14, 2006
  21. Jakub NarebskiDec 15, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.