From: Phil Hord <hordp@cisco.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH 0/2] git-stash: clear rerere state on conflict
Date: Fri, 6 Jul 2012 12:22:50 -0400 [thread overview]
Message-ID: <1341591772-26251-1-git-send-email-hordp@cisco.com> (raw)
This patch series adds a failing test and then a fix for the condition
discussed in these threads:
http://article.gmane.org/gmane.comp.version-control.git/177224
http://article.gmane.org/gmane.comp.version-control.git/201045
http://article.gmane.org/gmane.comp.version-control.git/200178/match=merge_rr
I previously floated this wrong-headed test after the same problem:
http://article.gmane.org/gmane.comp.version-control.git/177231
[PATCH 1/2] test: mergetool ignores rerere in git-stash
[PATCH 2/2] Clear rerere status during stash conflict
next reply other threads:[~2012-07-06 16:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-06 16:22 Phil Hord [this message]
2012-07-06 16:22 ` [PATCH 1/2] test: mergetool ignores rerere in git-stash Phil Hord
2012-07-06 16:22 ` [PATCH 2/2] Clear rerere status during stash conflict 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=1341591772-26251-1-git-send-email-hordp@cisco.com \
--to=hordp@cisco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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;
as well as URLs for NNTP newsgroup(s).