aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-16 18:23:33 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-16 18:23:33 -0800
commit3ae854c3567dd10055fbe12b8bd91bd2d447f55f (patch)
treef8d2941739838b2dfedbaa271cbabc81a6c890d4 /Documentation/git-merge.txt
parent06bf6ac4248e834a229027908d405f5e42ac96d7 (diff)
downloadgit-3ae854c3567dd10055fbe12b8bd91bd2d447f55f.tar.gz
git-3ae854c3567dd10055fbe12b8bd91bd2d447f55f.tar.xz
Examples of resetting.
Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0cac563d4..4ce799b52 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -37,6 +37,11 @@ include::merge-options.txt[]
include::merge-strategies.txt[]
+If you tried a merge which resulted in a complex conflicts and
+would want to start over, you can recover with
+gitlink:git-reset[1].
+
+
HOW MERGE WORKS
---------------