diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2009-02-26 10:52:53 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-02-26 23:06:27 -0800 |
| commit | c767184d8f99404d456b32a2c6c5c41d6db7a847 (patch) | |
| tree | 7799df4bddbc19b84121fb512a21d79d8e0bbe6e /merge-recursive.c | |
| parent | t5540-http-push.sh: avoid non-portable grep -P (diff) | |
| download | tgif-c767184d8f99404d456b32a2c6c5c41d6db7a847.tar.xz | |
git-am: Keep index in case of abort with dirty index
git am --abort resets the index unconditionally. But in case a previous
git am exited due to a dirty index it is preferable to keep that index.
Make it so.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions