{"thread":{"id":"12205","subject":"[PATCH] Correct git-pull documentation","startedAt":"2008-02-19T19:24:32Z","lastAt":"2008-02-19T19:24:32Z","messageCount":1,"participants":["Jay Soffian"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"69303","messageId":"1203449072-89011-1-git-send-email-jaysoffian@gmail.com","threadId":"12205","inReplyTo":null,"subject":"[PATCH] Correct git-pull documentation","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2008-02-19T19:24:32Z","receivedAt":"2008-02-19T19:24:32Z","isPatch":true,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"The --rebase option was documented in the wrong place (under MERGE\nSTRATEGIES instead of OPTIONS). Noted the branch.<name>.rebase\noption.\n\nSigned-off-by: Jay Soffian <jaysoffian@gmail.com>\n---\n Documentation/git-pull.txt |   20 ++++++++++++--------\n 1 files changed, 12 insertions(+), 8 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 179bdfc..7378943 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -15,6 +15,7 @@ DESCRIPTION\n -----------\n Runs `git-fetch` with the given parameters, and calls `git-merge`\n to merge the retrieved head(s) into the current branch.\n+With `--rebase`, calls `git-rebase` instead of `git-merge`.\n \n Note that you can use `.` (current directory) as the\n <repository> to pull from the local repository -- this is useful\n@@ -26,19 +27,14 @@ OPTIONS\n include::merge-options.txt[]\n \n :git-pull: 1\n-include::fetch-options.txt[]\n-\n-include::pull-fetch-param.txt[]\n-\n-include::urls-remotes.txt[]\n-\n-include::merge-strategies.txt[]\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.\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 +\n *NOTE:* This is a potentially _dangerous_ mode of operation.\n It rewrites history, which does not bode well when you\n@@ -48,6 +44,14 @@ unless you have read linkgit:git-rebase[1] carefully.\n \\--no-rebase::\n \tOverride earlier \\--rebase.\n \n+include::fetch-options.txt[]\n+\n+include::pull-fetch-param.txt[]\n+\n+include::urls-remotes.txt[]\n+\n+include::merge-strategies.txt[]\n+\n DEFAULT BEHAVIOUR\n -----------------\n \n-- \n1.5.4.2.204.gbea87\n"}]}