On Fri, Jul 19, 2013 at 6:20 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes:
>
>> Dropping the parenthetical comment might improve flow slightly:
>>
>> Without repository or branch on the command line, `git pull`
>> needs to be told how to integrate the changes with your history,
>> via either `--merge` or `--rebase`.
>>
>> With or without mention of the configuration options, either phrasing
>> seems pretty easy to digest.
>
> Yeah, that reads much better, but I do prefer to see something that
> explains this is often "just make sure you use the one that suits
> your project and always use that". How about something like this?
>
> With no repository or branch on the command line, `git pull` needs
> to be told how to integrate the changes with your history.
>
> This can be done via either `--merge` or `--rebase` option, but most
> people would want to decide which method matches the workflow of the
> project once, and set the configuration variable `pull.rebase` or
> `branch.<name>.rebase` to stick to it; see linkgit:git-config[1].
At this point, I'm probably just bike-shedding. Perhaps?
With no repository or branch on the command line, `git pull`
needs to be told how to integrate the changes with your history,
via either `--merge` or `--rebase`.
To match a project's workflow and make the choice of merge or
rebase permanent, set configuration variable `pull.rebase` or
`branch.<name>.rebase` (see linkgit:git-config[1]).
--
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