{"thread":{"id":"25694","subject":"[PATCH] Documentation/git-pull: clarify configuration","startedAt":"2010-11-09T20:56:47Z","lastAt":"2010-11-10T17:25:43Z","messageCount":3,"participants":["Martin von Zweigbergk","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"155565","messageId":"1289336209-28222-1-git-send-email-martin.von.zweigbergk@gmail.com","threadId":"25694","inReplyTo":null,"subject":"[PATCH] Documentation/git-pull: clarify configuration","fromName":"Martin von Zweigbergk","fromEmail":"martin.von.zweigbergk@gmail.com","sentAt":"2010-11-09T20:56:47Z","receivedAt":"2010-11-09T20:56:47Z","isPatch":true,"sender":{"key":"martinvonz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/891642?v=4"},"body":"The sentence about 'branch..rebase' refers to the first sentence\nin the paragraph. Clarify by moving it right after that sentence.\n\nSigned-off-by: Martin von Zweigbergk \n---\n Documentation/git-pull.txt | 11 +++++------\n 1 files changed, 5 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex c50f7dc..e9c0393 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -92,12 +92,11 @@ 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 ``, set configuration `branch..rebase`\n-\tto `true`.\n+\tInstead of a merge, perform a rebase after fetching. To make this\n+\tthe default for branch ``, set configuration\n+\t`branch..rebase` to `true`. If there is a remote ref for the\n+\tupstream branch, and this branch was rebased since last fetched, the\n+\trebase uses that information to avoid rebasing non-local changes.\n +\n [NOTE]\n This is a potentially _dangerous_ mode of operation.\n-- \n1.7.3.2.167.ga361b\n"},{"id":"155568","messageId":"20101110034846.GB2401@burratino","threadId":"25694","inReplyTo":"1289336209-28222-1-git-send-email-martin.von.zweigbergk@gmail.com","subject":"Re: [PATCH] Documentation/git-pull: clarify configuration","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-11-10T03:48:46Z","receivedAt":"2010-11-10T03:48:46Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Martin von Zweigbergk wrote:\n\n> The sentence about 'branch..rebase' refers to the first sentence\n> in the paragraph. Clarify by moving it right after that sentence.\n\nSane.\n\n> --- a/Documentation/git-pull.txt\n> +++ b/Documentation/git-pull.txt\n> @@ -92,12 +92,11 @@ 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 ``, set configuration `branch..rebase`\n> -\tto `true`.\n> +\tInstead of a merge, perform a rebase after fetching. To make this\n> +\tthe default for branch ``, set configuration\n> +\t`branch..rebase` to `true`.\n\nGrammatically, the narrator first gives an order to the git program\n(\"perform a rebase\") and then to the person configuring it (\"set the\nconfiguration\"). Maybe it would be clearer to focus on what the\nprogram does in this case?\n\n\tInstead of merging, rebase the current branch on top of the\n\tupstream branch after fetching. If there is a remote-tracking\n\tbranch corresponding to the upstream branch and the upstream\n\tbranch was rebased since last fetched, the rebase uses that\n\tinformation to avoid rebasing non-local changes.\n\n\tThe default behavior is to merge rather than rebasing, but it\n\tcan be overridden per branch with the `branch..rebase`\n\tconfiguration item (see git-config(1)).\n"},{"id":"155602","messageId":"20101110172543.GC11513@burratino","threadId":"25694","inReplyTo":"AANLkTik5MMKWune_i6omu=vXmuVEJqff6Bm0=yNcS9+z@mail.gmail.com","subject":"When is a patch ready for inclusion? (Re: [PATCH] Documentation/git-pull: clarify configuration)","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-11-10T17:25:43Z","receivedAt":"2010-11-10T17:25:43Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"(cc-ing the list because it seems likely the wording could be improved)\n\nHi Martin,\n\nMartin von Zweigbergk wrote:\n\n> I don't want to spam Junio, so I'm asking you instead. I sent my first\n> version of the patch to Junio as well. In SubmittingPatches, it says\n> \"[...] the maintainer (gitster@pobox.com) if (and only if) the patch\n> is ready for inclusion\". How do I know if it's ready for inclusion?\n\nI think that bit is not too important. The idea (and it isn't spelled\nout) is that you should Cc Junio if:\n\n - you need Junio's advice because it is his area of expertise, or\n - Junio has already been discussing the patch with you, or\n - it is urgent that the patch be applied\n\nand you probably should not Cc Junio if:\n\n - the patch is unpolished and covers a subject that is not his\n interest (e.g., something in contrib/)\n\n> Or is the\n> \"ready for inclusion\" just about my perception of my patches?\n\nYes. Hopefully this would make it easier to spot which patches are\nready for his attention and which need more discussion first. See [1]\nand [2].\n\nHope that helps,\nJonathan\n\n[1] http://thread.gmane.org/gmane.comp.version-control.git/72432/focus=72442\n[2] http://thread.gmane.org/gmane.comp.version-control.git/144199/focus=144506\n"}]}