From: Phil Hord <hordp@cisco.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, phil.hord@gmail.com
Subject: [PATCH v2 0/2] stash: invoke rerere in case of conflict
Date: Sat, 7 Jul 2012 16:46:00 -0400 [thread overview]
Message-ID: <1341693962-17090-1-git-send-email-hordp@cisco.com> (raw)
In-Reply-To: <CABURp0oXhZ5ysm4b3Z=7o+2TB+3wFdMjj4oEwxafApjD4c7ozA@mail.gmail.com>
[PATCH v2 1/2] test: git-stash conflict sets up rerere
A rewritten failing test to verify rerere is used during
'stash apply' conflicts.
[PATCH v2 2/2] stash: invoke rerere in case of conflict
The fix (written entirely by JCH) and switched the test
to expect success.
next prev parent reply other threads:[~2012-07-07 20:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-05 13:48 [RFC/PATCH] stash: Delete MERGE_RR before stash apply Phil Hord
2012-07-05 17:15 ` Junio C Hamano
2012-07-06 15:53 ` Phil Hord
2012-07-06 20:01 ` Junio C Hamano
2012-07-06 23:18 ` Phil Hord
2012-07-07 20:46 ` Phil Hord [this message]
2012-07-07 20:46 ` [PATCH v2 1/2] test: git-stash conflict sets up rerere Phil Hord
2012-07-09 2:37 ` Junio C Hamano
2012-07-09 14:41 ` Phil Hord
2012-08-16 22:00 ` Junio C Hamano
2012-08-17 17:52 ` Phil Hord
2012-08-17 18:02 ` Junio C Hamano
2012-07-07 20:46 ` [PATCH v2 2/2] stash: invoke rerere in case of 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=1341693962-17090-1-git-send-email-hordp@cisco.com \
--to=hordp@cisco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phil.hord@gmail.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).