diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
| commit | c2f3bf071ee90b01f2d629921bb04c4f798f02fa (patch) | |
| tree | 08ffe5b40e062d596deee47f3869278f4661a858 /Documentation/git-pull.txt | |
| parent | GIT 0.99.9n aka 1.0rc6 (diff) | |
| parent | Make "git-send-pack" less verbose by default (diff) | |
| download | tgif-c2f3bf071ee90b01f2d629921bb04c4f798f02fa.tar.xz | |
GIT 1.0.0
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 5 |
1 files changed, 5 insertions, 0 deletions
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] |