Re: [PATCH] Documentation clarification on git-checkout regarding ours/theirs

Am 10.07.2015 um 22:07 schrieb Junio C Hamano: "Simon A. Eugster" writes: From: "Simon A. Eugster" Signed-off-by: Simon A. Eugster --- For those who are looking from the sideline, this is a reroll from a month-old thread $gmane/271680. Documentation/g

[PATCH] Documentation clarification on git-checkout regarding ours/theirs

From: "Simon A. Eugster" Signed-off-by: Simon A. Eugster --- Documentation/git-checkout.txt | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index d263a56..d69306f 100644 --- a/Documen

[PATCH 1/2] Documentation clarification on git-checkout regarding ours/theirs

From: "Simon A. Eugster" Signed-off-by: Simon A. Eugster --- Documentation/git-checkout.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index d263a56..5c3ef86 100644 --- a/Documen

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

--- 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

[PATCH] Documentation clarification on git-checkout

I hope I managed to get this working with replying to your response, Junio, git send-email is all new to me. Thanks a lot for your detailled answer. I tried to integrate it and hope it is understandable this way? Simon -- To unsubscribe from this list: send the line "unsubscribe git" in the b

[PATCH] Documentation clarification on git-checkout regarding ours/theirs

From: "Simon A. Eugster" Signed-off-by: Simon A. Eugster --- Documentation/git-checkout.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index d263a56..5c3ef86 100644 --- a/Documen