Skip to content

Commit

Permalink
git-pull.txt: Mention branch.autosetuprebase
Browse files Browse the repository at this point in the history
In "Options related to merging" mention also related option
branch.autosetuprebase in git-config(1).

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jari Aalto authored and Junio C Hamano committed Dec 3, 2010
1 parent 7e4eb21 commit c4f4157
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Documentation/git-pull.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit c4f4157

Please sign in to comment.