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

2015-06-17 Thread Junio C Hamano
Simon Eugster writes: > A better picture would be nice. > And regarding the textual description, are you going to commit your version? Nah, I'd rather not take credit away from you ;-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.ke

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

2015-06-17 Thread Simon Eugster
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 is a good thing. >>> - Lack of sign-off. >>> >>> Why is there still 1/2, if its effect

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

2015-06-16 Thread 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 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? > > > So

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

2015-06-16 Thread Simon Eugster
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

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

2015-06-15 Thread 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? > Documentation/git-checkout.txt | 39 +++ > 1 file changed, 35 ins

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

2015-06-15 Thread Simon A. Eugster
--- Documentation/git-checkout.txt | 39 +++ 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 5c3ef86..ec0be28 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git