diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2010-11-12 18:55:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 21:17:46 (GMT) |
| commit | 11fe3f73cce13b759a728b0a9ac95e745470f251 (patch) | |
| tree | 68bf9488e64c3c55e38d5e86dbbb4a4312ffd8a7 /Documentation/git-pull.txt | |
| parent | 6a6c54bafed84220bcd09b19b40c104d1ff687cc (diff) | |
| download | git-11fe3f73cce13b759a728b0a9ac95e745470f251.zip git-11fe3f73cce13b759a728b0a9ac95e745470f251.tar.gz git-11fe3f73cce13b759a728b0a9ac95e745470f251.tar.bz2 | |
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.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c50f7dc..e1b0bd2 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. |