From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Dec 2010 05:49:53 +0000 (-0800)
Subject: Merge branch 'ja/maint-pull-rebase-doc'
X-Git-Tag: v1.7.4-rc0~49
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b5c178143088350c49129acbedb864d70c666215?ds=inline;hp=-c

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

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

b5c178143088350c49129acbedb864d70c666215
diff --combined Documentation/git-pull.txt
index 4db73737b0,765fbebc2e..30466917da
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@@ -26,9 -26,9 +26,9 @@@ With `--rebase`, it runs 'git rebase' i
  <repository> should be the name of a remote repository as
  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.
 +a collection of refs with corresponding remote-tracking branches
 +(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.
@@@ -136,7 -137,7 +137,7 @@@ and if there is not any such variable, 
  in `$GIT_DIR/remotes/<origin>` file is used.
  
  In order to determine what remote branches to fetch (and
 -optionally store in the tracking branches) when the command is
 +optionally store in the remote-tracking branches) when the command is
  run without any refspec parameters on the command line, values
  of the configuration variable `remote.<origin>.fetch` are
  consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>`
@@@ -149,9 -150,9 +150,9 @@@ refs/heads/*:refs/remotes/origin/
  ------------
  
  A globbing refspec must have a non-empty RHS (i.e. must store
 -what were fetched in tracking branches), and its LHS and RHS
 +what were fetched in remote-tracking branches), and its LHS and RHS
  must end with `/*`.  The above specifies that all remote
 -branches are tracked using tracking branches in
 +branches are tracked using remote-tracking branches in
  `refs/remotes/origin/` hierarchy under the same name.
  
  The rule to determine which remote branch to merge after