summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-17 02:23:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-17 02:23:33 (GMT)
commit3ae854c3567dd10055fbe12b8bd91bd2d447f55f (patch)
treef8d2941739838b2dfedbaa271cbabc81a6c890d4 /Documentation/git-pull.txt
parent06bf6ac4248e834a229027908d405f5e42ac96d7 (diff)
downloadgit-3ae854c3567dd10055fbe12b8bd91bd2d447f55f.zip
git-3ae854c3567dd10055fbe12b8bd91bd2d447f55f.tar.gz
git-3ae854c3567dd10055fbe12b8bd91bd2d447f55f.tar.bz2
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-pull.txt')
-rw-r--r--Documentation/git-pull.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index c65ca9a..3a7d385 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -104,6 +104,11 @@ merge the remote `origin` head into the current,
local `master` branch.
+If you tried a pull which resulted in a complex conflicts and
+would want to start over, you can recover with
+gitlink:git-reset[1].
+
+
SEE ALSO
--------
gitlink:git-fetch[1], gitlink:git-merge[1]