Re: [PATCH V5 2/2] user-manual: add section documenting shallow clones

2015-12-29 Thread Junio C Hamano
Junio C Hamano writes: > Thanks for working on this. Perhaps the last paragraph can be like > this? > > Merging inside a <> will work > as long as a merge base is found in the resent history. > Otherwise, it will be like merging unrelated histories and may > have to result in hug

Re: [PATCH V5 2/2] user-manual: add section documenting shallow clones

2015-12-29 Thread Junio C Hamano
Stephen & Linda Smith writes: > On Tuesday, December 29, 2015 11:24:00 AM Junio C Hamano wrote: >> "Stephen P. Smith" writes: >> >> > Rather than merely pointing readers at the 1.5 release notes to >> > learn about shallow clones, document them formally. >> > >> > Signed-off-by: Stephen P. Smit

Re: [PATCH V5 2/2] user-manual: add section documenting shallow clones

2015-12-29 Thread Stephen & Linda Smith
On Tuesday, December 29, 2015 11:24:00 AM Junio C Hamano wrote: > "Stephen P. Smith" writes: > > > Rather than merely pointing readers at the 1.5 release notes to > > learn about shallow clones, document them formally. > > > > Signed-off-by: Stephen P. Smith > > --- > > Thanks. I do not think

Re: [PATCH V5 2/2] user-manual: add section documenting shallow clones

2015-12-29 Thread Junio C Hamano
"Stephen P. Smith" writes: > Rather than merely pointing readers at the 1.5 release notes to > learn about shallow clones, document them formally. > > Signed-off-by: Stephen P. Smith > --- Thanks. I do not think the reference to RelNotes were meant for the end-user readers, though. That was a

[PATCH V5 2/2] user-manual: add section documenting shallow clones

2015-12-29 Thread Stephen P. Smith
Rather than merely pointing readers at the 1.5 release notes to learn about shallow clones, document them formally. Signed-off-by: Stephen P. Smith --- Notes: Added a paragraph about the fundamental limitation with merging histories that do not have a merge base in the shallow repository