From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Mar 2008 08:54:46 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1c536069780bc67c05e621f0485f787d04559f24?hp=-c

Merge branch 'maint'

* maint:
git-pull documentation: warn about the option order
---

1c536069780bc67c05e621f0485f787d04559f24
diff --combined Documentation/git-pull.txt
index 737894390d,f7b90a326f..3405ca09e8
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@@ -15,26 -15,32 +15,28 @@@ DESCRIPTIO
  -----------
  Runs `git-fetch` with the given parameters, and calls `git-merge`
  to merge the retrieved head(s) into the current branch.
 +With `--rebase`, calls `git-rebase` instead of `git-merge`.
  
  Note that you can use `.` (current directory) as the
  <repository> to pull from the local repository -- this is useful
  when merging local branches into the current branch.
  
+ Also note that options meant for `git-pull` itself and underlying
+ `git-merge` must be given before the options meant for `git-fetch`.
  
  OPTIONS
  -------
  include::merge-options.txt[]
  
  :git-pull: 1
 -include::fetch-options.txt[]
 -
 -include::pull-fetch-param.txt[]
 -
 -include::urls-remotes.txt[]
 -
 -include::merge-strategies.txt[]
  
  \--rebase::
  	Instead of a merge, perform a rebase after fetching.  If
  	there is a remote ref for the upstream branch, and this branch
  	was rebased since last fetched, the rebase uses that information
 -	to avoid rebasing non-local changes.
 +	to avoid rebasing non-local changes. To make this the default
 +	for branch `<name>`, set configuration `branch.<name>.rebase`
 +	to `true`.
  +
  *NOTE:* This is a potentially _dangerous_ mode of operation.
  It rewrites history, which does not bode well when you
@@@ -44,14 -50,6 +46,14 @@@ unless you have read linkgit:git-rebase
  \--no-rebase::
  	Override earlier \--rebase.
  
 +include::fetch-options.txt[]
 +
 +include::pull-fetch-param.txt[]
 +
 +include::urls-remotes.txt[]
 +
 +include::merge-strategies.txt[]
 +
  DEFAULT BEHAVIOUR
  -----------------