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

Re: On-branch topic description support?

From
Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Date
Jul 21, 2022, 19:13 UTC
Message-ID
<20220721191349.kf3zx4tpwrjhzudt@nitro.local>
In-Reply-To
<20220721182645.45xrwf2buohibcaw@meerkat.local>
On Thu, Jul 21, 2022 at 02:26:45PM -0400, Konstantin Ryabitsev wrote:
> I'll play with tip merge commits and see how well my "survives rebases" tests
> go.

Hmm... well, it works great as long as you remember to always use --rebase-merges. The moment you forget to pass -r to "git rebase", your cover letter commit disappears, and I'm not sure this is going to work for what I am trying to do (which is to make the process of submitting patch series simpler). I know it's possible to configure git so that "git pull --rebase" preserves merges, but there doesn't appear to be a way to force "git rebase -i" to do the same without the -r flag. Also, "rebase -ir" looks really different when there is a tip merge commit, which will probably also be confusing to newbies just starting out with rebase workflows.

So, I'm not sure that at this time this is objectively "better" than keeping the cover letter in an empty commit at the start of the series. :-/

-K
Previous: Ævar Arnfjörð BjarmasonNext: Junio C Hamano
Message 21 of 25 in “On-branch topic description support?”
  1. Junio C HamanoJul 20, 2022
  2. Shaoxuan YuanJul 21, 2022
  3. Elijah NewrenJul 21, 2022
  4. Junio C HamanoJul 21, 2022
  5. Konstantin RyabitsevJul 21, 2022
  6. Philip OakleyJul 21, 2022
  7. Junio C HamanoJul 21, 2022
  8. Junio C HamanoJul 21, 2022
  9. rsbecker@nexbridge.comJul 21, 2022
  10. Konstantin RyabitsevJul 21, 2022
  11. rsbecker@nexbridge.comJul 21, 2022
  12. Ævar Arnfjörð BjarmasonJul 21, 2022
  13. Konstantin RyabitsevJul 21, 2022
  14. Junio C HamanoJul 21, 2022
  15. Ævar Arnfjörð BjarmasonJul 21, 2022
  16. Junio C HamanoJul 21, 2022
  17. Ævar Arnfjörð BjarmasonJul 21, 2022
  18. Junio C HamanoJul 21, 2022
  19. Konstantin RyabitsevJul 21, 2022
  20. Ævar Arnfjörð BjarmasonJul 21, 2022
  21. Konstantin RyabitsevJul 21, 2022
  22. Junio C HamanoJul 21, 2022
  23. Konstantin RyabitsevJul 21, 2022
  24. Junio C HamanoJul 21, 2022
  25. Bagas SanjayaJul 22, 2022

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.