Skip to content

Commit ea7dc01

Browse files
newrengitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 225bc32 commit ea7dc01

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Documentation/git-am.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ default. You can use `--no-utf8` to override this.
178178

179179
--abort::
180180
Restore the original branch and abort the patching operation.
181+
Revert contents of files involved in the am operation to their
182+
pre-am state.
181183

182184
--quit::
183185
Abort the patching operation but keep HEAD and the index

0 commit comments

Comments
 (0)