summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2010-11-12 19:55:58 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-17 13:17:46 -0800
commit11fe3f73cce13b759a728b0a9ac95e745470f251 (patch)
tree68bf9488e64c3c55e38d5e86dbbb4a4312ffd8a7 /Documentation/git-pull.txt
parent6a6c54bafed84220bcd09b19b40c104d1ff687cc (diff)
downloadgit-11fe3f73cce13b759a728b0a9ac95e745470f251.tar.gz
Documentation/git-pull: clarify configuration
The sentence about 'branch.<name>.rebase' refers to the first sentence in the paragraph and not to the sentence about avoiding rebasing non-local changes. Clarify this. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt14
1 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index c50f7dcb89..e1b0bd2868 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -92,12 +92,14 @@ include::merge-options.txt[]
:git-pull: 1
--rebase::
- Instead of a merge, perform a rebase after fetching. If
- there is a remote ref for the upstream branch, and this branch
- was rebased since last fetched, the rebase uses that information
- to avoid rebasing non-local changes. To make this the default
- for branch `<name>`, set configuration `branch.<name>.rebase`
- to `true`.
+ Rebase the current branch on top of the upstream branch after
+ fetching. If there is a remote-tracking branch corresponding to
+ the upstream branch and the upstream branch was rebased since last
+ 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.
+
[NOTE]
This is a potentially _dangerous_ mode of operation.