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
Junio C Hamano <junkio@cox.net>
Date
Dec 14, 2006, 20:41 UTC
Message-ID
<7vejr22ose.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<200612141519.44294.andyparkins@gmail.com>
Andy Parkins <andyparkins@gmail.com> writes:
> "master" shouldn't get special treatment
In principle yes.

However, the fmt-merge-message was designed so for a very practical reason --- to keep Merge commit log messages Linus makes in the kernel repository short and readable.

When your workflow is heavily based on merges from topics to more than one maintenance tracks (say, 'maint' and 'master') and the policy is to keep older maintenance tracks to be subsets of newer maintenance tracks (e.g. changes applicable to an older maintenance track are first merged into 'maint' and then 'maint' is merged into 'master'), being able to see the patchflow is sometimes handy [*1*].

I do not have issues against making git-status to always note which branch the commit is going to be made, though.

[Footnote]

*1* Right now we do not have --only-merges option to log family, so I use "show-branch maint master | grep '^ *-'" instead to get this information.

Previous: Robin RosenbergNext: Andy Parkins
Message 16 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.