]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c71930 c5ead19)
Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 18:22:09 +0000 (11:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 18:22:09 +0000 (11:22 -0700)
* 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.