Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
branch -r -v: do not spit out garbage
[gitweb.git]
/
Documentation
/
git-pull.txt
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index 99eb7eda366dd8a01aa1ed19ea7efb8a7f39b38c..d9537ebc6a8df5311275965eb62ca106566a7f8c 100644
(file)
--- a/
Documentation/git-pull.txt
+++ b/
Documentation/git-pull.txt
@@
-182,8
+182,7
@@
The final command then merges the newly fetched `tmp` into master.
If you tried a pull which resulted in a complex conflicts and
-would want to start over, you can recover with
-linkgit:git-reset[1].
+would want to start over, you can recover with `git-reset`.
SEE ALSO