From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing list <git@vger.kernel.org>,
Kevin Daudt <me@ikke.info>,
"Robert P. J. Day" <rpjday@crashcourse.ca>
Subject: Re: [PATCH] checkout doc: clarify command line args for "checkout paths" mode
Date: Tue, 10 Oct 2017 22:16:04 -0700 [thread overview]
Message-ID: <20171011051604.GA140836@aiede.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqzi8ymg4f.fsf@gitster.mtv.corp.google.com>
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 <jrnieder@gmail.com>
Thanks.
prev parent reply other threads:[~2017-10-11 5:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-30 9:27 "man git-checkout", man page is inconsistent between SYNOPSIS and details Robert P. J. Day
2017-09-30 14:32 ` Kevin Daudt
2017-09-30 15:01 ` Robert P. J. Day
2017-09-30 22:04 ` Robert P. J. Day
2017-10-01 3:49 ` Junio C Hamano
2017-10-01 10:05 ` Robert P. J. Day
2017-10-02 0:29 ` Junio C Hamano
2017-10-11 2:39 ` [PATCH] checkout doc: clarify command line args for "checkout paths" mode Junio C Hamano
2017-10-11 3:22 ` Jonathan Nieder
2017-10-11 5:02 ` Junio C Hamano
2017-10-11 5:16 ` Jonathan Nieder [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171011051604.GA140836@aiede.mtv.corp.google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ikke.info \
--cc=rpjday@crashcourse.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).