From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 31 Oct 2009 03:05:47 +0000 (-0700)
Subject: Merge branch 'ja/fetch-doc'
X-Git-Tag: v1.6.6-rc0~83
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b7eb912b0d3352d43a11c79fab97cd7f92f0646e?ds=inline;hp=-c

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
---

b7eb912b0d3352d43a11c79fab97cd7f92f0646e
diff --combined Documentation/git-pull.txt
index de2bcd63bb,51534dd848..b93201158f
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@@ -26,6 -26,10 +26,10 @@@ Also note that options meant for 'git-p
  
  OPTIONS
  -------
+ 
+ Options related to merging
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
  include::merge-options.txt[]
  
  :git-pull: 1
@@@ -47,6 -51,9 +51,9 @@@ unless you have read linkgit:git-rebase
  --no-rebase::
  	Override earlier --rebase.
  
+ Options related to fetching
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
  include::fetch-options.txt[]
  
  include::pull-fetch-param.txt[]
@@@ -131,13 -138,54 +138,13 @@@ $ git pull origin nex
  ------------------------------------------------
  +
  This leaves a copy of `next` temporarily in FETCH_HEAD, but
 -does not update any remote-tracking branches.
 -
 -* Bundle local branch `fixes` and `enhancements` on top of
 -  the current branch, making an Octopus merge:
 -+
 -------------------------------------------------
 -$ git pull . fixes enhancements
 -------------------------------------------------
 -+
 -This `git pull .` syntax is equivalent to `git merge`.
 -
 -* Merge local branch `obsolete` into the current branch, using `ours`
 -  merge strategy:
 -+
 -------------------------------------------------
 -$ git pull -s ours . obsolete
 -------------------------------------------------
 -
 -* Merge local branch `maint` into the current branch, but do not make
 -  a commit automatically:
 +does not update any remote-tracking branches. Using remote-tracking
 +branches, the same can be done by invoking fetch and merge:
  +
  ------------------------------------------------
 -$ git pull --no-commit . maint
 +$ git fetch origin
 +$ git merge origin/next
  ------------------------------------------------
 -+
 -This can be used when you want to include further changes to the
 -merge, or want to write your own merge commit message.
 -+
 -You should refrain from abusing this option to sneak substantial
 -changes into a merge commit.  Small fixups like bumping
 -release/version name would be acceptable.
 -
 -* Command line pull of multiple branches from one repository:
 -+
 -------------------------------------------------
 -$ git checkout master
 -$ git fetch origin +pu:pu maint:tmp
 -$ git pull . tmp
 -------------------------------------------------
 -+
 -This updates (or creates, as necessary) branches `pu` and `tmp` in
 -the local repository by fetching from the branches (respectively)
 -`pu` and `maint` from the remote repository.
 -+
 -The `pu` branch will be updated even if it is does not fast-forward;
 -the others will not be.
 -+
 -The final command then merges the newly fetched `tmp` into master.
  
  
  If you tried a pull which resulted in a complex conflicts and