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>
Martin von Zweigbergk committed
Nov 12, 2010 at 19:55 UTC
11fe3f73cce13b759a728b0a9ac95e745470f251
1 file changed
+8
-6
Documentation/git-pull.txt
+8
-6
@@ -92,12 +92,14 @@ include::merge-options.txt[]
92
:git-pull: 1
93
94
--rebase::
95
- Instead of a merge, perform a rebase after fetching. If
96
- there is a remote ref for the upstream branch, and this branch
97
- was rebased since last fetched, the rebase uses that information
98
- to avoid rebasing non-local changes. To make this the default
99
- for branch `<name>`, set configuration `branch.<name>.rebase`
100
- to `true`.
95
+ Rebase the current branch on top of the upstream branch after
96
+ fetching. If there is a remote-tracking branch corresponding to
97
+ the upstream branch and the upstream branch was rebased since last
98
+ fetched, the rebase uses that information to avoid rebasing
99
+ non-local changes.
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.
103
+
104
[NOTE]
105
This is a potentially _dangerous_ mode of operation.