{"thread":{"id":"25731","subject":"[PATCH v3] Documentation/git-pull: clarify configuration","startedAt":"2010-11-12T18:55:58Z","lastAt":"2010-11-12T18:55:58Z","messageCount":1,"participants":["Martin von Zweigbergk"],"isPatch":true,"patchVersion":3,"patchTotal":null},"messages":[{"id":"155811","messageId":"1289588158-6869-1-git-send-email-martin.von.zweigbergk@gmail.com","threadId":"25731","inReplyTo":null,"subject":"[PATCH v3] Documentation/git-pull: clarify configuration","fromName":"Martin von Zweigbergk","fromEmail":"martin.von.zweigbergk@gmail.com","sentAt":"2010-11-12T18:55:58Z","receivedAt":"2010-11-12T18:55:58Z","isPatch":true,"sender":{"key":"martinvonz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/891642?v=4"},"body":"The sentence about 'branch.<name>.rebase' refers to the first sentence\nin the paragraph and not to the sentence about avoiding rebasing\nnon-local changes. Clarify this.\n\nSigned-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>\n---\nChanges since v2: Use the text provided by Junio and, consequently, it\nactually generates valid documentation :-)\n\n Documentation/git-pull.txt |   14 ++++++++------\n 1 files changed, 8 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex c50f7dc..e1b0bd2 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -92,12 +92,14 @@ include::merge-options.txt[]\n :git-pull: 1\n \n --rebase::\n-\tInstead of a merge, perform a rebase after fetching.  If\n-\tthere is a remote ref for the upstream branch, and this branch\n-\twas rebased since last fetched, the rebase uses that information\n-\tto avoid rebasing non-local changes. To make this the default\n-\tfor branch `<name>`, set configuration `branch.<name>.rebase`\n-\tto `true`.\n+\tRebase the current branch on top of the upstream branch after\n+\tfetching.  If there is a remote-tracking branch corresponding to\n+\tthe upstream branch and the upstream branch was rebased since last\n+\tfetched, the rebase uses that information to avoid rebasing\n+\tnon-local changes.\n++\n+See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make\n+`git pull` always use `{litdd}rebase` instead of merging.\n +\n [NOTE]\n This is a potentially _dangerous_ mode of operation.\n-- \n1.7.3.2.167.ga361b\n"}]}