On 14-05-30 01:54 PM, Junio C Hamano wrote:
> Marc Branchaud writes:
>>
>> Then start the next sentence with
>>
>> In this case, you would want
>
> I somehow find that "in this case" redundant, given that "for such
> branches" already limits the scope of the suggestion. I dunno.
I shr
Marc Branchaud writes:
>> +When the remote branch you want to fetch is known to
>> +be rewound and rebased regularly, it is expected that
>> +the tip of it will not be descendant of the commit that
>> +used to be at its tip the last time you fetched it and
>> +stored in your remote-tracking branc
On 14-05-29 06:42 PM, Junio C Hamano wrote:
> While it is not *wrong* per-se to say that pulling a rewound/rebased
> branch will lead to an unnecessary merge conflict, that is not what
> the leading "+" sign to allow non-fast-forward update of remote-tracking
> branch is at all.
>
> Signed-off-by:
3 matches
Mail list logo
