summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-09 13:37:01 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-09 13:37:01 -0800
commit1ee740e66975adbab080301ebd364e253be3d513 (patch)
tree672932e73881b55204ec237b9047c8532d891a61 /Documentation/git-pull.txt
parentef87690b27fd1facdc8cc48f6789a930939303a3 (diff)
parent6b37dff17f176d7e87efa93b4cf521dd725de247 (diff)
downloadgit-1ee740e66975adbab080301ebd364e253be3d513.tar.gz
Merge branch 'ab/pull-rebase-config'
* ab/pull-rebase-config: pull: introduce a pull.rebase option to enable --rebase
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index e1da468766..0f18ec891a 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -108,7 +108,7 @@ include::merge-options.txt[]
fetched, the rebase uses that information to avoid rebasing
non-local changes.
+
-See `branch.<name>.rebase` and `branch.autosetuprebase` in
+See `pull.rebase`, `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.
+