diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:46 -0700 |
| commit | b809c3d9005cdbf6b193a78a32240b247ee81b36 (patch) | |
| tree | d9cf56a8361b09a62cd63f8d26306e19ebab2987 /Documentation | |
| parent | Merge branch 'ps/update-ref-batch-flush' into maint (diff) | |
| parent | am: fix incorrect exit status on am fail to abort (diff) | |
| download | tgif-b809c3d9005cdbf6b193a78a32240b247ee81b36.tar.xz | |
Merge branch 'en/am-abort-fix' into maint
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 8714dfcb76..0a4a984dfd 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -178,6 +178,8 @@ default. You can use `--no-utf8` to override this. --abort:: Restore the original branch and abort the patching operation. + Revert contents of files involved in the am operation to their + pre-am state. --quit:: Abort the patching operation but keep HEAD and the index |