[PATCH v3] Documentation/git-pull: clarify configuration
From: Martin von Zweigbergk <hidden>
Date: 2016-06-15 22:50:02
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
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 <redacted> --- Changes since v2: Use the text provided by Junio and, consequently, it actually generates valid documentation :-) 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.
--
1.7.3.2.167.ga361b