aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-30 20:05:47 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-30 20:05:47 -0700
commitb7eb912b0d3352d43a11c79fab97cd7f92f0646e (patch)
tree0555031fb52e097495e7642a7c98be03264edd73 /Documentation/git-pull.txt
parent0f06f3ff76bea09a2344adacca5bfc0d637b2086 (diff)
parent7c85d27429784c181ca633fb1465a9c651dbce8a (diff)
downloadgit-b7eb912b0d3352d43a11c79fab97cd7f92f0646e.tar.gz
git-b7eb912b0d3352d43a11c79fab97cd7f92f0646e.tar.xz
Merge branch 'ja/fetch-doc'
* 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.txt7
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[]