user-manual.txt: prefer 'merge --abort' over 'reset --hard'

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 94799faa2b44b95d7191e5d9b81341c9dcceac9b..4e210970e1d375959377df60dfc51221b027ca6f 100644 (file)
--- 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,