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

2015-07-12 Thread Junio C Hamano
"Simon A. Eugster" writes: >> +... As the keeper of >> +the canonical history, you need to view the history from the remote >> +as `ours` (i.e. "our shared canonical history"), while what you did >> +on your side branch as `theirs` (i.e. "one contributor's work on top >> +of it"). >> >> -b ::

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

2015-07-10 Thread Simon A. Eugster
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/git-checkout.txt | 16 +

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

2015-07-10 Thread 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/git-checkout.txt | 16 +++- > 1 file changed, 15 insertions(+), 1 d

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

2015-07-10 Thread Simon A. Eugster
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/Documentation/git-

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

2015-06-11 Thread Junio C Hamano
"Simon A. Eugster" writes: > 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..5c3ef8

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

2015-06-11 Thread Simon A. Eugster
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/Documentation/git-checkout.txt