Re: [PATCH 2/2] Documentation on git-checkout --ours/--theirs improved

2015-06-16 17:41 GMT+02:00 Junio C Hamano : > Simon Eugster writes: > >> 2015-06-15 22:10 GMT+02:00 Junio C Hamano : >>> >>> "Simon A. Eugster" writes: >>> >>> > --- >>> >>> - Lack of explanation as to why this

Re: [PATCH 2/2] Documentation on git-checkout --ours/--theirs improved

2015-06-15 22:10 GMT+02:00 Junio C Hamano : > > "Simon A. Eugster" writes: > > > --- > > - Lack of explanation as to why this is a good thing. > - Lack of sign-off. > > Why is there still 1/2, if its effect is wholly annulled by a > subsequent step 2/2? Sorry for that, still trying to find out h