Re: [PATCH v2 3/9] fetch doc: update note on '+' in front of the refspec

2014-06-18 Thread Michael Haggerty
On 06/04/2014 12:16 AM, 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. Helped-by: Marc

[PATCH v2 3/9] fetch doc: update note on '+' in front of the refspec

2014-06-03 Thread Junio C Hamano
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. Helped-by: Marc Branchaud marcn...@xiplink.com Signed-off-by: Junio C