From: Nguyễn Thái Ngọc Duy Date: Thu, 25 Apr 2019 09:45:57 +0000 (+0700) Subject: user-manual.txt: prefer 'merge --abort' over 'reset --hard' X-Git-Tag: v2.23.0-rc0~64^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc991b43df83ee32a92b9d906e77276e5dbd639c;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 94799faa2b..4e210970e1 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1408,7 +1408,7 @@ If you get stuck and decide to just give up and throw the whole mess away, you can always return to the pre-merge state with ------------------------------------------------- -$ git reset --hard HEAD +$ git merge --abort ------------------------------------------------- Or, if you've already committed the merge that you want to throw away,