From 3ae854c3567dd10055fbe12b8bd91bd2d447f55f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 16 Dec 2005 18:23:33 -0800 Subject: 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 --- Documentation/git-pull.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Documentation/git-pull.txt') diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c65ca9a530..3a7d385225 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] -- cgit v1.3