projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b276e1
)
Documentation/git-pull.txt: Add subtitles above included option files
author
Jari Aalto
<jari.aalto@cante.net>
Thu, 22 Oct 2009 14:14:57 +0000
(17:14 +0300)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 22 Oct 2009 19:39:10 +0000
(12:39 -0700)
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-pull.txt
patch
|
blob
|
history
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index 7578623edba9e2ddc5232f1a981bcb297182638d..51534dd84802005b2a300209da4b7132eccb4032 100644
(file)
--- a/
Documentation/git-pull.txt
+++ b/
Documentation/git-pull.txt
@@
-26,6
+26,10
@@
Also note that options meant for 'git-pull' itself and underlying
OPTIONS
-------
+
+Options related to merging
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
include::merge-options.txt[]
:git-pull: 1
@@
-47,6
+51,9
@@
unless you have read linkgit:git-rebase[1] carefully.
--no-rebase::
Override earlier --rebase.
+Options related to fetching
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
include::fetch-options.txt[]
include::pull-fetch-param.txt[]