summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorMarkus Heidelberg <markus.heidelberg@web.de>2008-12-19 12:14:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-19 19:55:33 (GMT)
commitec9f0ea3e6ecf1237223dec8428e7bb73d339320 (patch)
tree327def1d666d8bc1e7e4cd68df344d63f230e050 /Documentation/git-reset.txt
parent0956a6db7ae3a93c7bce62c1e3a6e0795055ad9f (diff)
downloadgit-ec9f0ea3e6ecf1237223dec8428e7bb73d339320.zip
git-ec9f0ea3e6ecf1237223dec8428e7bb73d339320.tar.gz
git-ec9f0ea3e6ecf1237223dec8428e7bb73d339320.tar.bz2
Documentation: sync example output with git output
Don't confuse the user with old git messages. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-reset.txt')
-rw-r--r--Documentation/git-reset.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 29156f6..2049f3d 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -130,7 +130,7 @@ Undo a merge or pull::
$ git pull <1>
Auto-merging nitfol
CONFLICT (content): Merge conflict in nitfol
-Automatic merge failed/prevented; fix up by hand
+Automatic merge failed; fix conflicts and then commit the result.
$ git reset --hard <2>
$ git pull . topic/branch <3>
Updating from 41223... to 13134...