On Wed, Nov 10, 2010 at 12:24 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Hi again, > > Martin von Zweigbergk wrote: > >> The sentence about 'branch.<name>.rebase' refers to the first sentence >> in the paragraph. Clarify by putting it in a separate paragraph. > > I think the patch clarifies by rewording a little, too. :) Yes, you are right :-). Will improve it in version 3, if I'm asked to provide that. >> --- a/Documentation/git-pull.txt >> +++ b/Documentation/git-pull.txt >> @@ -92,12 +92,15 @@ 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`. >> + 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.<name>.rebase` >> + configuration item (see git-config(1)). >> + > > Do these changes result in good output with "make -C Documentation > git-pull.1" or "make -C Documentation git-pull.html"? I think it > might need to be > > first paragraph > + > second paragraph > + > third paragraph > > or similar. > Oops, that's embarrassing... but thanks for the hints. I did not know that. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html