Re: [PATCH] checkout doc: clarify command line args for "checkout paths" mode

2017-10-10 Thread Jonathan Nieder
Junio C Hamano wrote: > here is another attempt, this time to avoid "Restore" and ... > > Documentation/git-checkout.txt | 30 -- > 1 file changed, 16 insertions(+), 14 deletions(-) Thanks. I find this one easier to read indeed. [...] > ---

Re: [PATCH] checkout doc: clarify command line args for "checkout paths" mode

2017-10-10 Thread Junio C Hamano
Jonathan Nieder writes: >> +'git checkout' [] [--] ... >> -'git checkout' [-p|--patch] [] [--] [...] >> +'git checkout' (-p|--patch) [] [--] [...] > ... > Even for this particular form, the current file is inconsistent about > whether to call the arguments '...' or '...'. >

Re: [PATCH] checkout doc: clarify command line args for "checkout paths" mode

2017-10-10 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: [...] > The source of the confusion is that -p(atch) is described as if it > is just another "optional" part and its description is lumped > together with the non patch mode, even though the actual end user > experience is vastly different. Makes sense. This should

[PATCH] checkout doc: clarify command line args for "checkout paths" mode

2017-10-10 Thread Junio C Hamano
There are "git checkout [-p][][--][...]" in the SYNOPSIS section, and "git checkout [-p][][--]..." as the header for the section that explains the "check out paths from index/tree-ish" mode. It is unclear if we require at least one path, or it is entirely optional. Actually, both are wrong.