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

Re: Avoiding 'master' nomenclature

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Jul 29, 2020, 20:46 UTC
Message-ID
<CAHk-=whYOHQ5T-5ozUG6DCfKUyJ14qPoVWqsyHSjQBK450wigA@mail.gmail.com>
In-Reply-To
<20200729203856.GA519065@google.com>
On Wed, Jul 29, 2020 at 1:39 PM Jonathan Nieder <jrnieder@gmail.com> wrote:
Show 5 quoted lines
>
> What would help in figuring out how to do that is, instead of more
> reminders of how stupid we are, some more information about what would
> be useful for you (both directly in your use of git and indirectly in
> the history you would like to have available to you for pulling).

I've sent the patch. It's "tested" only in the sense that the test-suite continues to work, but it's really just a revert together with replacing "master" with using git_default_branch_name() instead.

I would have thought the old behavior was self-explanatory: don't bother saying that you're merging into the default branch, because the default branch name is - wait for it - not interesting.

And yes, I was annoyed by this, and sorry for calling it stupid.

But I was annoyed by this because it took me much too long to notice that my merge messages are now unnecessarily ugly for the last two days, for a _very_ bad reason.

And I'm annoyed because I agree that "master" isn't a great default name, and I treat it as historical. So then making that less-than-great name more visible in the history is actually really sad, in addition to being just ugly.

            Linus
Previous: Jonathan NiederNext: Linus Torvalds
Message 5 of 42 in “Avoiding 'master' nomenclature”
  1. Linus TorvaldsJul 29, 2020
  2. Junio C HamanoJul 29, 2020
  3. Linus TorvaldsJul 29, 2020
  4. Jonathan NiederJul 29, 2020
  5. Linus TorvaldsJul 29, 2020
  6. Linus TorvaldsJul 29, 2020
  7. lego_12239@rambler.ruJul 30, 2020
  8. Jeff KingJul 31, 2020
  9. OlegJul 31, 2020
  10. Linus TorvaldsJul 29, 2020
  11. Jeff KingJul 29, 2020
  12. Linus TorvaldsJul 29, 2020
  13. Jeff KingJul 30, 2020
  14. Linus TorvaldsJul 30, 2020
  15. Jeff KingJul 30, 2020
  16. Linus TorvaldsJul 30, 2020
  17. Jeff KingJul 31, 2020
  18. Junio C HamanoJul 29, 2020
  19. Junio C HamanoJul 29, 2020
  20. Jeff KingJul 30, 2020
  21. Linus TorvaldsJul 30, 2020
  22. Michal SuchánekJul 30, 2020
  23. Jeff KingJul 30, 2020
  24. Junio C HamanoJul 30, 2020
  25. 0/2 fmt-merge-msg: selectively suppress "into <branch>"Junio C Hamano, Jul 30, 2020
  26. 2/2 fmt-merge-msg: allow merge destination to be omitted againJunio C Hamano, Jul 30, 2020
  27. 1/2 Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano, Jul 30, 2020
  28. Eric SunshineJul 30, 2020
  29. Junio C HamanoJul 30, 2020
  30. Jeff KingJul 31, 2020
  31. Junio C HamanoJul 31, 2020
  32. Jeff KingJul 31, 2020
  33. Taylor BlauJul 31, 2020
  34. Junio C HamanoJul 31, 2020
  35. Taylor BlauJul 31, 2020
  36. Michal SuchánekAug 1, 2020
  37. Johannes SchindelinAug 10, 2020
  38. Junio C HamanoAug 10, 2020
  39. Johannes SchindelinAug 11, 2020
  40. Junio C HamanoAug 12, 2020
  41. Junio C HamanoJul 29, 2020
  42. Linus TorvaldsJul 29, 2020

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.