From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: Phil Hord <hordp@cisco.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>,
David Aguilar <davvid@gmail.com>
Subject: Re: rerere affects handling of git-stash-pop merge conflicts
Date: Fri, 15 Jul 2011 22:19:27 -0400 (EDT) [thread overview]
Message-ID: <alpine.DEB.2.00.1107152208530.12060@debian> (raw)
In-Reply-To: <4E1F22DF.7060209@cisco.com>
On Thu, 14 Jul 2011, Phil Hord wrote:
> Summary:
> After a 'git stash pop' with conflicts, 'git mergetool' fails to notice
> the conflicted files if 'rerere.enabled=true'. git mergetool
> erroneously reports 'no files need merging'.
It seems to be because git-stash uses git merge-recursive directly
instead of calling git merge. I don't know why git merge-recursive is
used directly. It has been like that ever since git-stash was
introduced in f2c66ed (Add git-stash script, 2007-06-30).
next prev parent reply other threads:[~2011-07-16 2:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-14 17:09 rerere affects handling of git-stash-pop merge conflicts Phil Hord
2011-07-15 20:19 ` Phil Hord
2011-07-15 21:05 ` [PATCH/RFC] Add two basic tests for "rerere remaining" Phil Hord
2011-07-16 2:19 ` Martin von Zweigbergk [this message]
2011-07-17 21:59 ` rerere affects handling of git-stash-pop merge conflicts Junio C Hamano
2011-07-25 22:31 ` [PATCH] Add two basic tests for "rerere remaining" Phil Hord
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.00.1107152208530.12060@debian \
--to=martin.von.zweigbergk@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hordp@cisco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox