From: Martin von Zweigbergk Date: Tue, 09 Nov 2010 20:56:47 GMT Subject: [PATCH] Documentation/git-pull: clarify configuration Message-ID: <1289336209-28222-1-git-send-email-martin.von.zweigbergk@gmail.com> The sentence about 'branch..rebase' refers to the first sentence in the paragraph. Clarify by moving it right after that sentence. Signed-off-by: Martin von Zweigbergk --- Documentation/git-pull.txt | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c50f7dc..e9c0393 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -92,12 +92,11 @@ 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 a merge, perform a rebase after fetching. To make this + the default for branch ``, set configuration + `branch..rebase` to `true`. 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. + [NOTE] This is a potentially _dangerous_ mode of operation. -- 1.7.3.2.167.ga361b