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

gitster · gitster · commit b69fb7866b24 · 2010-12-14T07:36:23.000-08:00
* ja/maint-pull-rebase-doc:
  git-pull.txt: Mention branch.autosetuprebase
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
@@ -98,8 +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.

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,9 @@ include::merge-options.txt[]`
`98`	`98`	`fetched, the rebase uses that information to avoid rebasing`
`99`	`99`	`non-local changes.`
`100`	`100`	`+`
`101`		-See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make
`102`		-`git pull` always use `{litdd}rebase` instead of merging.
	`101`	+See `branch.<name>.rebase` and `branch.autosetuprebase` in
	`102`	+linkgit:git-config[1] if you want to make `git pull` always use
	`103`	+`{litdd}rebase` instead of merging.
`103`	`104`	`+`
`104`	`105`	`[NOTE]`
`105`	`106`	`This is a potentially _dangerous_ mode of operation.`