From: Jari Aalto Date: Thu, 22 Oct 2009 14:14:57 +0000 (+0300) Subject: Documentation/git-pull.txt: Add subtitles above included option files X-Git-Tag: v1.6.5.3~14^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f7a9b5ad128151e6eb0b45266779e63e4b2287a;p=git.git Documentation/git-pull.txt: Add subtitles above included option files Signed-off-by: Jari Aalto Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 7578623ed..51534dd84 100644 --- 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[]