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

Re: [PATCH 08/10] Use 'remote-tracking branch' in generated merge messages

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Oct 23, 2010, 19:53 UTC
Message-ID
<vpqiq0sk7n9.fsf@bauges.imag.fr>
In-Reply-To
<20101023190441.GK21040@burratino>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 6 quoted lines
> Matthieu Moy wrote:
>
>> [Subject: [PATCH 08/10] Use 'remote-tracking branch' in generated merge messages]
>
> Maybe this should be squashed with the corresponding "git fetch" hunk
> in 7/10 for bisectability.

Actually, the "git fetch" hunk is not directly used by fmt-merge-msg, it is parsed, and re-pretty-printed. I'm not sure I understood all the details of the code, but the tests do pass between patch 7 and patch 8.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Jonathan NiederNext: Matthieu Moy
Message 25 of 101 in “More consistant terminology ("remote-tracking branch", "not updated")”
  1. 00/11 More consistant terminology ("remote-tracking branch", "not updated")Matthieu Moy, Oct 23, 2010
  2. 01/10 Better "Changed but not updated" message in git-statusMatthieu Moy, Oct 23, 2010
  3. Jonathan NiederOct 23, 2010
  4. Matthieu MoyOct 23, 2010
  5. Jakub NarebskiOct 23, 2010
  6. 02/10 Remplace "remote tracking" with "remote-tracking"Matthieu Moy, Oct 23, 2010
  7. Jonathan NiederOct 23, 2010
  8. Jonathan NiederOct 23, 2010
  9. Matthieu MoyOct 23, 2010
  10. 03/10 Change remote tracking to remote-tracking in non-trivial placesMatthieu Moy, Oct 23, 2010
  11. Jonathan NiederOct 23, 2010
  12. Matthieu MoyOct 23, 2010
  13. 04/10 Change "tracking branch" to "remote-tracking branch"Matthieu Moy, Oct 23, 2010
  14. Jonathan NiederOct 23, 2010
  15. Matthieu MoyOct 28, 2010
  16. 05/10 Change "tracking branch" to "remote-tracking branch" in C codeMatthieu Moy, Oct 23, 2010
  17. Jonathan NiederOct 23, 2010
  18. Matthieu MoyOct 26, 2010
  19. 06/10 Change incorrect uses of "remote branch" meaning "remote-tracking"Matthieu Moy, Oct 23, 2010
  20. 07/10 Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy, Oct 23, 2010
  21. Jonathan NiederOct 23, 2010
  22. Matthieu MoyOct 23, 2010
  23. 08/10 Use 'remote-tracking branch' in generated merge messagesMatthieu Moy, Oct 23, 2010
  24. Jonathan NiederOct 23, 2010
  25. Matthieu MoyOct 23, 2010
  26. 09/10 user-manual.txt: explain better the remote(-tracking) branch termsMatthieu Moy, Oct 23, 2010
  27. Jonathan NiederOct 23, 2010
  28. Matthieu MoyOct 23, 2010
  29. Thore HusfeldtOct 24, 2010
  30. Jonathan NiederOct 24, 2010
  31. Jakub NarebskiOct 24, 2010
  32. Matthieu MoyOct 26, 2010
  33. Miles BaderOct 26, 2010
  34. 10/10 git-branch.txt: mention --set-upstream as a way to change upstream configurationMatthieu Moy, Oct 23, 2010
  35. Jakub NarebskiOct 23, 2010
  36. Jonathan NiederOct 23, 2010
  37. Matthieu MoyOct 25, 2010
  38. 00/10 More consistant terminology ("remote-tracking branch", "not updated")Matthieu Moy, Oct 25, 2010
  39. 01/10 Better "Changed but not updated" message in git-statusMatthieu Moy, Oct 25, 2010
  40. 02/10 Replace "remote tracking" with "remote-tracking"Matthieu Moy, Oct 25, 2010
  41. 03/10 Change remote tracking to remote-tracking in non-trivial placesMatthieu Moy, Oct 25, 2010
  42. 04/10 Change "tracking branch" to "remote-tracking branch"Matthieu Moy, Oct 25, 2010
  43. 05/10 Change "tracking branch" to "remote-tracking branch" in C codeMatthieu Moy, Oct 25, 2010
  44. 06/10 Change incorrect uses of "remote branch" meaning "remote-tracking"Matthieu Moy, Oct 25, 2010
  45. 07/10 Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy, Oct 25, 2010
  46. 08/10 Use 'remote-tracking branch' in generated merge messagesMatthieu Moy, Oct 25, 2010
  47. 09/10 user-manual.txt: explain better the remote(-tracking) branch termsMatthieu Moy, Oct 25, 2010
  48. Jay SoffianOct 26, 2010
  49. Matthieu MoyOct 26, 2010
  50. Jay SoffianOct 26, 2010
  51. Matthieu MoyOct 27, 2010
  52. user-manual.txt: explain better the remote(-tracking) branch termsMatthieu Moy, Oct 27, 2010
  53. 10/10 git-branch.txt: mention --set-upstream as a way to change upstream configurationMatthieu Moy, Oct 25, 2010
  54. Drew NorthupOct 25, 2010
  55. 00/10 More consistant terminology ("remote-tracking branch", "not updated")Matthieu Moy, Oct 28, 2010
  56. 01/10 Better "Changed but not updated" message in git-statusMatthieu Moy, Oct 28, 2010
  57. Jonathan NiederOct 28, 2010
  58. Junio C HamanoOct 28, 2010
  59. Jonathan NiederOct 28, 2010
  60. Matthieu MoyOct 28, 2010
  61. Junio C HamanoOct 28, 2010
  62. Matthieu MoyOct 28, 2010
  63. Drew NorthupOct 29, 2010
  64. Matthieu MoyOct 30, 2010
  65. 02/10 Replace "remote tracking" with "remote-tracking"Matthieu Moy, Oct 28, 2010
  66. Jonathan NiederOct 28, 2010
  67. 03/10 Change remote tracking to remote-tracking in non-trivial placesMatthieu Moy, Oct 28, 2010
  68. Jonathan NiederOct 28, 2010
  69. Matthieu MoyOct 28, 2010
  70. Jonathan NiederOct 28, 2010
  71. Matthieu MoyOct 28, 2010
  72. Drew NorthupOct 29, 2010
  73. 04/10 Change "tracking branch" to "remote-tracking branch"Matthieu Moy, Oct 28, 2010
  74. Jonathan NiederOct 28, 2010
  75. 05/10 Change incorrect uses of "remote branch" meaning "remote-tracking"Matthieu Moy, Oct 28, 2010
  76. 06/10 Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy, Oct 28, 2010
  77. Jonathan NiederOct 28, 2010
  78. Matthieu MoyOct 28, 2010
  79. Jonathan NiederOct 28, 2010
  80. 07/10 Use 'remote-tracking branch' in generated merge messagesMatthieu Moy, Oct 28, 2010
  81. 08/10 user-manual.txt: explain better the remote(-tracking) branch termsMatthieu Moy, Oct 28, 2010
  82. Jonathan NiederOct 28, 2010
  83. Matthieu MoyOct 28, 2010
  84. 09/10 user-manual: remote-tracking can be checked out, with detached HEADMatthieu Moy, Oct 28, 2010
  85. 10/10 git-branch.txt: mention --set-upstream as a way to change upstream configurationMatthieu Moy, Oct 28, 2010
  86. Jonathan NiederOct 28, 2010
  87. 00/11 More consistant terminologyMatthieu Moy, Oct 30, 2010
  88. Jonathan NiederOct 30, 2010
  89. 01/11 Better "Changed but not updated" message in git-statusMatthieu Moy, Oct 30, 2010
  90. 02/11 Replace "remote tracking" with "remote-tracking"Matthieu Moy, Oct 30, 2010
  91. 03/11 Change remote tracking to remote-tracking in non-trivial placesMatthieu Moy, Oct 30, 2010
  92. 04/11 everyday.txt: change "tracking branch" to "remote-tracking branch"Matthieu Moy, Oct 30, 2010
  93. 05/11 Change "tracking branch" to "remote-tracking branch"Matthieu Moy, Oct 30, 2010
  94. 06/11 Change incorrect uses of "remote branch" meaning "remote-tracking"Matthieu Moy, Oct 30, 2010
  95. 07/11 Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy, Oct 30, 2010
  96. 08/11 Use 'remote-tracking branch' in generated merge messagesMatthieu Moy, Oct 30, 2010
  97. 09/11 user-manual.txt: explain better the remote(-tracking) branch termsMatthieu Moy, Oct 30, 2010
  98. Jonathan NiederOct 30, 2010
  99. Matthieu MoyOct 31, 2010
  100. 10/11 user-manual: remote-tracking can be checked out, with detached HEADMatthieu Moy, Oct 30, 2010
  101. 11/11 git-branch.txt: mention --set-upstream as a way to change upstream configurationMatthieu Moy, Oct 30, 2010

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.