Documentation/git-pull.txt: Add subtitles above included option files
Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jari Aalto committed
Oct 22, 2009 at 17:14 UTC
3f7a9b5ad128151e6eb0b45266779e63e4b2287a
1 file changed
+7
Documentation/git-pull.txt
+7
@@ -26,6 +26,10 @@ Also note that options meant for 'git-pull' itself and underlying
26
27
OPTIONS
28
-------
29
+
30
+Options related to merging
31
+~~~~~~~~~~~~~~~~~~~~~~~~~~
32
+
33
include::merge-options.txt[]
34
35
:git-pull: 1
@@ -47,6 +51,9 @@ unless you have read linkgit:git-rebase[1] carefully.
51
--no-rebase::
52
Override earlier --rebase.
53
54
+Options related to fetching
55
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
56
+
57
include::fetch-options.txt[]
58
59
include::pull-fetch-param.txt[]