diff options
| author |  Jari Aalto <jari.aalto@cante.net> | 2009-10-22 17:14:57 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-10-22 12:39:10 -0700 |
| commit | 3f7a9b5ad128151e6eb0b45266779e63e4b2287a (patch) | |
| tree | 314cf168fdd39fddb47f76745b5b4a2c1375128f | |
| parent | Documentation/fetch-options.txt: order options alphabetically (diff) | |
| download | tgif-3f7a9b5ad128151e6eb0b45266779e63e4b2287a.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-pull.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 7578623edb..51534dd848 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[] |