summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-09-10 10:31:14 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-10 15:51:14 -0700
commitea7dc012d20feb2b19964c207cd579437d2da26c (patch)
treecb7c6281594decc44079ce07c06c52d0493838e2 /builtin/merge-file.c
parentGit 2.33 (diff)
downloadtgif-ea7dc012d20feb2b19964c207cd579437d2da26c.tar.xz
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 <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions