diff options
| author |  Markus Heidelberg <markus.heidelberg@web.de> | 2008-12-19 13:14:52 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-12-19 11:55:33 -0800 |
| commit | ec9f0ea3e6ecf1237223dec8428e7bb73d339320 (patch) | |
| tree | 327def1d666d8bc1e7e4cd68df344d63f230e050 /Documentation/git-reset.txt | |
| parent | Fix type-mismatch compiler warning from diff_populate_filespec() (diff) | |
| download | tgif-ec9f0ea3e6ecf1237223dec8428e7bb73d339320.tar.xz | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 29156f6c3c..2049f3d97b 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... |