kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Martin von Zweigbergk 2010-11-12 19:55:58 +01:00 committed by Junio C Hamano
parent 6a6c54bafe
commit 11fe3f73cc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/git-pull.txt
View File

@ -92,12 +92,14 @@ include::merge-options.txt[]
:git-pull: 1 :git-pull: 1


--rebase:: --rebase::
Instead of a merge, perform a rebase after fetching. If Rebase the current branch on top of the upstream branch after
there is a remote ref for the upstream branch, and this branch fetching. If there is a remote-tracking branch corresponding to
was rebased since last fetched, the rebase uses that information the upstream branch and the upstream branch was rebased since last
to avoid rebasing non-local changes. To make this the default fetched, the rebase uses that information to avoid rebasing
for branch `<name>`, set configuration `branch.<name>.rebase` non-local changes.
to `true`. +
See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make
`git pull` always use `{litdd}rebase` instead of merging.
+ +
[NOTE] [NOTE]
This is a potentially _dangerous_ mode of operation. This is a potentially _dangerous_ mode of operation.