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

Re: [PATCH] reset: --unmerge

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 27, 2016, 16:23 UTC
Message-ID
<xmqqzilp7od3.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<87d1il3hhs.fsf@linux-m68k.org>
Andreas Schwab <schwab@linux-m68k.org> writes:
Show 7 quoted lines
> On Okt 25 2016, Junio C Hamano <gitster@pobox.com> wrote:
>
>> Somebody with a bright idea decided that vc-git-resolve-conflicts
>> variable should be on by default in Emacs 25.1 X-<
>
> This is consistent with the behaviour of the other VC backends, where it
> isn't even customizable.

The problem I had was "M-x save-buffer" (after resolving the conflicts in it manually) running "git add" on the resulting file, robbing from "git diff" an opportunity to help the user to see how the result looks relative to both branches.

Do you mean that VC mode broke the same feature equally other SCMs, too? Do other SCM supported by VC backends take advantage of unmerged stages in the index (until you say "$scm add") by allowing you to verify the combined diff with "$scm diff"?

Previous: Andreas SchwabNext: Sergey Organov
Message 8 of 9 in “reset: --unmerge”
  1. reset: --unmergeJunio C Hamano, Oct 24, 2016
  2. Duy NguyenOct 25, 2016
  3. Duy NguyenOct 25, 2016
  4. Junio C HamanoOct 25, 2016
  5. Duy NguyenOct 26, 2016
  6. Junio C HamanoOct 26, 2016
  7. Andreas SchwabOct 27, 2016
  8. Junio C HamanoOct 27, 2016
  9. Sergey OrganovOct 25, 2016

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.