Skip to content

Commit fc991b4

Browse files
pcloudsgitster
authored andcommitted
user-manual.txt: prefer 'merge --abort' over 'reset --hard'
Since the operation in progress is merge, stick to the 'git merge' variant of aborting. 'git reset --hard' does not really tell you about aborting the merge by just looking, longer to type, and even though I know by heart what --hard do, I still dislike it when I need to consider whether --hard, --mixed or --soft. Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 75f4c7c commit fc991b4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/user-manual.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1408,7 +1408,7 @@ If you get stuck and decide to just give up and throw the whole mess
14081408
away, you can always return to the pre-merge state with
14091409

14101410
-------------------------------------------------
1411-
$ git reset --hard HEAD
1411+
$ git merge --abort
14121412
-------------------------------------------------
14131413

14141414
Or, if you've already committed the merge that you want to throw away,

0 commit comments

Comments
 (0)