summaryrefslogtreecommitdiffstats
path: root/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-23 14:35:54 -0700
committerJunio C Hamano <gitster@pobox.com>2021-09-23 14:35:54 -0700
commiteb4d567e7d4be3b673ecb1b77c89eef87fbbe48d (patch)
tree6e670971ae46d00fcae30de77c12521f083b641b /git-am.txt
parentde44de3d9e71db785a0bbd06a6ddad8d2c38dd67 (diff)
downloadgit-htmldocs-eb4d567e7d4be3b673ecb1b77c89eef87fbbe48d.tar.gz
Autogenerated HTML docs for v2.33.0-591-gddb10
Diffstat (limited to 'git-am.txt')
-rw-r--r--git-am.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-am.txt b/git-am.txt
index 8714dfcb7..0a4a984df 100644
--- a/git-am.txt
+++ b/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