diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-23 23:44:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-23 23:44:45 +0300 |
| commit | 6c84b007c41638814137d296e75446a9b4865fd2 (patch) | |
| tree | b2cdbc8c83b206d183b21403a862515f2ee6a9a1 /Documentation | |
| parent | 06a0eeaa25891edb6ef83c1ea62b2feb6e6652ab (diff) | |
| parent | c5ead19ea282a288e01d86536349a4ae4a093e4b (diff) | |
Merge branch 'en/am-abort-fix'
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 |