projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Examples of resetting.
[git.git]
/
Documentation
/
git-pull.txt
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index
c65ca9a
..
3a7d385
100644
(file)
--- 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]