# [PATCH] Documentation/git-pull: clarify configuration 3 messages from 2010-11-09 to 2010-11-10. Participants: Martin von Zweigbergk, Jonathan Nieder. Thread: https://gitlist.dev/t/25694 ## Martin von Zweigbergk, 2010-11-09 20:56 Subject: [PATCH] Documentation/git-pull: clarify configuration Message-ID: <1289336209-28222-1-git-send-email-martin.von.zweigbergk@gmail.com> URL: https://gitlist.dev/e/1289336209-28222-1-git-send-email-martin.von.zweigbergk%40gmail.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 ``` ## Jonathan Nieder, 2010-11-10 03:48 Subject: Re: [PATCH] Documentation/git-pull: clarify configuration Message-ID: <20101110034846.GB2401@burratino> URL: https://gitlist.dev/e/20101110034846.GB2401%40burratino In-Reply-To: <1289336209-28222-1-git-send-email-martin.von.zweigbergk@gmail.com> ``` Martin von Zweigbergk wrote: > The sentence about 'branch..rebase' refers to the first sentence > in the paragraph. Clarify by moving it right after that sentence. Sane. > --- 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`. Grammatically, the narrator first gives an order to the git program ("perform a rebase") and then to the person configuring it ("set the configuration"). Maybe it would be clearer to focus on what the program does in this case? Instead of merging, 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. The default behavior is to merge rather than rebasing, but it can be overridden per branch with the `branch..rebase` configuration item (see git-config(1)). ``` ## Jonathan Nieder, 2010-11-10 17:25 Subject: When is a patch ready for inclusion? (Re: [PATCH] Documentation/git-pull: clarify configuration) Message-ID: <20101110172543.GC11513@burratino> URL: https://gitlist.dev/e/20101110172543.GC11513%40burratino In-Reply-To: ``` (cc-ing the list because it seems likely the wording could be improved) Hi Martin, Martin von Zweigbergk wrote: > I don't want to spam Junio, so I'm asking you instead. I sent my first > version of the patch to Junio as well. In SubmittingPatches, it says > "[...] the maintainer (gitster@pobox.com) if (and only if) the patch > is ready for inclusion". How do I know if it's ready for inclusion? I think that bit is not too important. The idea (and it isn't spelled out) is that you should Cc Junio if: - you need Junio's advice because it is his area of expertise, or - Junio has already been discussing the patch with you, or - it is urgent that the patch be applied and you probably should not Cc Junio if: - the patch is unpolished and covers a subject that is not his interest (e.g., something in contrib/) > Or is the > "ready for inclusion" just about my perception of my patches? Yes. Hopefully this would make it easier to spot which patches are ready for his attention and which need more discussion first. See [1] and [2]. Hope that helps, Jonathan [1] http://thread.gmane.org/gmane.comp.version-control.git/72432/focus=72442 [2] http://thread.gmane.org/gmane.comp.version-control.git/144199/focus=144506 ```