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

Re: how to automatically open conflicted files when "git rebase" encounter conflict

From
EEErik Cervin Edin <erik@cervined.in>
Date
Mar 18, 2022, 16:01 UTC
Message-ID
<CA+JQ7M-2kRnHrTCErTOY5O=4PCbRc7DWOHt1q5DxXmCu6z7K1A@mail.gmail.com>
In-Reply-To
<xmqqtubvc32q.fsf@gitster.g>
On Fri, Mar 18, 2022 at 4:38 PM Junio C Hamano <gitster@pobox.com> wrote:
> Perhaps take "git jump" from contrib/ and do
>
>     $ GIT_EDITOR=vi git jump merge
This looks interesting. Thanks Junio
Previous: Junio C HamanoNext: wuzhouhui
Message 3 of 8 in “how to automatically open conflicted files when "git rebase" encounter conflict”
  1. wuzhouhuiMar 18, 2022
  2. Junio C HamanoMar 18, 2022
  3. Erik Cervin EdinMar 18, 2022
  4. wuzhouhuiMar 19, 2022
  5. Erik Cervin EdinMar 18, 2022
  6. Junio C HamanoMar 18, 2022
  7. brian m. carlsonMar 18, 2022
  8. Junio C HamanoMar 18, 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.