projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Autogenerated HTML docs for v1.2.0-ge8a1
[git.git]
/
git-pull.txt
diff --git
a/git-pull.txt
b/git-pull.txt
index
3a7d385
..
20175f4
100644
(file)
--- a/
git-pull.txt
+++ b/
git-pull.txt
@@
-29,8
+29,9
@@
include::fetch-options.txt[]
include::pull-fetch-param.txt[]
-include::
merge-strategie
s.txt[]
+include::
url
s.txt[]
+include::merge-strategies.txt[]
EXAMPLES
--------