From: Martin von Zweigbergk Date: Wed, 10 Nov 2010 07:13:08 GMT Subject: [PATCH v2] Documentation/git-pull: clarify configuration Message-ID: <1289373188-32543-1-git-send-email-martin.von.zweigbergk@gmail.com> The sentence about 'branch..rebase' refers to the first sentence in the paragraph. Clarify by putting it in a separate paragraph. Text provided by Jonathan Nieder. Signed-off-by: Martin von Zweigbergk --- Documentation/git-pull.txt | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c50f7dc..055126e 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -92,12 +92,15 @@ 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 ``, set configuration `branch..rebase` - to `true`. + Instead of merging, 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. + + The default behavior is to merge rather than rebasing, but it + can be overridden per branch with the `branch..rebase` + configuration item (see git-config(1)). + [NOTE] This is a potentially _dangerous_ mode of operation. -- 1.7.3.2.167.ga361b