[PATCH v2 13/16] user-manual.txt: prefer 'merge --abort' over 'reset --hard'

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Apr 11, 2019, 13:12 UTC
Message-ID: <20190411131218.19195-14-pclouds@gmail.com>
In-Reply-To: <20190411131218.19195-1-pclouds@gmail.com>

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 <pclouds@gmail.com>
---
 Documentation/user-manual.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,

-- 
2.21.0.682.g30d2204636