]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit04d3761db214512fa29db39bd43e0b162396045c
tree6572361322d0f0262a0239daee989dda353dcf11
parent4c719308ce59dc70e606f910f40801f2c6051b24
parentc5ead19ea282a288e01d86536349a4ae4a093e4b
Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes

* 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
builtin/am.c