diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:38:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:38:18 -0800 |
| commit | f411c43e8a5102c093681edec3e8a4c5992ac06b (patch) | |
| tree | ceb9eb998f1313da203d77894eed990c292ffaec /Documentation/git-pull.txt | |
| parent | 077f3d405a4d366456c82fb9a09abef06edcb88d (diff) | |
| parent | 7c85d27429784c181ca633fb1465a9c651dbce8a (diff) | |
| download | git-f411c43e8a5102c093681edec3e8a4c5992ac06b.tar.gz git-f411c43e8a5102c093681edec3e8a4c5992ac06b.tar.xz | |
Merge branch 'ja/fetch-doc' into maint
* ja/fetch-doc:
Documentation/merge-options.txt: order options in alphabetical groups
Documentation/git-pull.txt: Add subtitles above included option files
Documentation/fetch-options.txt: order options alphabetically
Diffstat (limited to 'Documentation/git-pull.txt')
| -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 de2bcd63b..b93201158 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[] |