]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06a0eea c5ead19)
Merge branch 'en/am-abort-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Sep 2021 20:44:45 +0000 (13:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Sep 2021 20:44:45 +0000 (13:44 -0700)
When "git am --abort" fails to abort correctly, it still exited
with exit status of 0, which has been corrected.

* en/am-abort-fix:
  am: fix incorrect exit status on am fail to abort
  t4151: add a few am --abort tests
  git-am.txt: clarify --abort behavior

1  2 
builtin/am.c patch | diff1 | diff2 | blob | history

diff --cc builtin/am.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.