Junio C Hamano wrote: > here is another attempt, this time to avoid "Restore" and <paths>... > > Documentation/git-checkout.txt | 30 ++++++++++++++++-------------- > 1 file changed, 16 insertions(+), 14 deletions(-)
Thanks. I find this one easier to read indeed. [...] > --- a/Documentation/git-checkout.txt > +++ b/Documentation/git-checkout.txt > @@ -13,7 +13,8 @@ SYNOPSIS [...] > @@ -101,6 +95,14 @@ specific side of the merge can be checked out of the > index by > using `--ours` or `--theirs`. With `-m`, changes made to the working tree > file can be discarded to re-create the original conflicted merge result. > > +'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]:: > + This is similar to the "check out paths to the working tree > + from either the index or from a tree-ish" mode described > + above, but lets you use the interactive interface to show > + the "diff" output and choose which hunks to use in the > + result. See below for the descriptoin of `--patch` option. nit: s/descriptoin/description/ With that tweak, Reviewed-by: Jonathan Nieder <jrnie...@gmail.com> Thanks.
