From: Elijah Newren Date: Fri, 10 Sep 2021 10:31:14 +0000 (+0000) Subject: git-am.txt: clarify --abort behavior X-Git-Tag: v2.33.1~9^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea7dc012d20feb2b19964c207cd579437d2da26c;p=thirdparty%2Fgit.git git-am.txt: clarify --abort behavior Both Johannes and I assumed (perhaps due to familiarity with rebase) that am --abort would return the user to a clean state. However, since am, unlike rebase, is intended to be used within a dirty working tree, --abort will only clean the files involved in the am operation. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- 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