From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Dec 2010 15:36:23 +0000 (-0800)
Subject: Merge branch 'ja/maint-pull-rebase-doc' into maint
X-Git-Tag: v1.7.3.4~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b69fb7866b24b205a876a6a0b256c786a58419c7?ds=inline;hp=-c

Merge branch 'ja/maint-pull-rebase-doc' into maint

* ja/maint-pull-rebase-doc:
git-pull.txt: Mention branch.autosetuprebase
---

b69fb7866b24b205a876a6a0b256c786a58419c7
diff --combined Documentation/git-pull.txt
index abbc3eb3e0,765fbebc2e..64009dee31
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@@ -27,8 -27,8 +27,8 @@@ With `--rebase`, it runs 'git rebase' i
  passed to linkgit:git-fetch[1].  <refspec> can name an
  arbitrary remote ref (for example, the name of a tag) or even
  a collection of refs with corresponding remote tracking branches
 -(e.g., refs/heads/*:refs/remotes/origin/*), but usually it is
 -the name of a branch in the remote repository.
 +(e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}),
 +but usually it is the name of a branch in the remote repository.
  
  Default values for <repository> and <branch> are read from the
  "remote" and "merge" configuration for the current branch
@@@ -98,8 -98,9 +98,9 @@@ include::merge-options.txt[
  	fetched, the rebase uses that information to avoid rebasing
  	non-local changes.
  +
- See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make
- `git pull` always use `{litdd}rebase` instead of merging.
+ See `branch.<name>.rebase` and `branch.autosetuprebase` in
+ linkgit:git-config[1] if you want to make `git pull` always use
+ `{litdd}rebase` instead of merging.
  +
  [NOTE]
  This is a potentially _dangerous_ mode of operation.