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

Re: [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially"

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jul 30, 2020, 19:10 UTC
Message-ID
<CAPig+cS=icR6PGBObChLQf5+OKbNPDvvZ62n7Y9jGnifoSUdkA@mail.gmail.com>
In-Reply-To
<20200730180237.1392480-2-gitster@pobox.com>
/On Thu, Jul 30, 2020 at 2:03 PM Junio C Hamano <gitster@pobox.com> wrote:
> This reverts commit 489947cee5095b168cbac111ff7bd1eadbbd90dd, which
> stopped treating merges into the 'master' branch any specially when

s/any specially/specially/ ...or... s/any specially/as special/

Show 13 quoted lines
> preparing the default merge message.  As the goal was not to have
> any single branch designated as special, it solved it by leaving the
> "into <branchname>" at the end of the title of the default merge
> message for any and all branches.  An obvious and easy alternative
> to treat everybody equally could have been to remove it for every
> branch, but that involves loss of information.
>
> We'll introduce a new mechanism to let end-users specify merges into
> which branches would omit the "into <branchname>" from the title of
> the default merge message, and make the mechanism, when unconfigured,
> treat the traditional 'master' special again, so all the changes to
> the tests we made earlier will become unnecessary, as these tests
> will be run with out configuring the said new mechanism.
s/with out/without/
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Previous: Junio C HamanoNext: Junio C Hamano
Message 28 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.