From: "Jakub Narębski" <jnareb@gmail.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/2] reset: support the --stdin option
Date: Tue, 11 Oct 2016 22:49:54 +0200 [thread overview]
Message-ID: <dc76476b-9ad5-a3b6-f12f-33cda2ca5814@gmail.com> (raw)
In-Reply-To: <2c7a52e43be710c7f37c4886629bda38df183c21.1476202100.git.johannes.schindelin@gmx.de>
W dniu 11.10.2016 o 18:09, Johannes Schindelin pisze:
> SYNOPSIS
> --------
> [verse]
> -'git reset' [-q] [<tree-ish>] [--] <paths>...
> +'git reset' [-q] [--stdin [-z]] [<tree-ish>] [--] <paths>...
I think you meant here
+'git reset' [-q] [--stdin [-z]] [<tree-ish>]
Because you say "*Instead*" below.
> +--stdin::
> + Instead of taking list of paths from the command line,
> + read list of paths from the standard input. Paths are
> + separated by LF (i.e. one path per line) by default.
And die if <paths> were supplied:
> + if (pathspec.nr)
> + die(_("--stdin is incompatible with path arguments"));
Of course you need to fix it in built-in synopsis as well:
> + N_("git reset [-q] [--stdin [-z]] [<tree-ish>] [--] <paths>..."),
> N_("git reset --patch [<tree-ish>] [--] [<paths>...]"),
--
Jakub Narębski
next prev parent reply other threads:[~2016-10-11 21:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-11 16:08 [PATCH 0/2] Support `git reset --stdin` Johannes Schindelin
2016-10-11 16:09 ` [PATCH 1/2] reset: fix usage Johannes Schindelin
2016-10-11 16:09 ` [PATCH 2/2] reset: support the --stdin option Johannes Schindelin
2016-10-11 17:53 ` Junio C Hamano
2016-10-12 12:57 ` Johannes Schindelin
2016-10-11 20:49 ` Jakub Narębski [this message]
2016-10-12 12:39 ` Johannes Schindelin
2016-10-11 18:34 ` [PATCH 0/2] Support `git reset --stdin` Jeff King
2016-10-11 19:27 ` Junio C Hamano
2016-10-11 21:26 ` Jeff King
2016-10-11 21:36 ` Junio C Hamano
2016-10-11 21:47 ` Jeff King
2016-10-11 21:49 ` Junio C Hamano
2017-01-27 12:38 ` [PATCH v2 0/1] " Johannes Schindelin
2017-01-27 12:38 ` [PATCH v2 1/1] reset: support the --stdin option Johannes Schindelin
2017-01-27 17:04 ` Jeff King
2017-01-27 17:34 ` Johannes Schindelin
2017-01-27 17:54 ` Jeff King
2017-01-27 18:30 ` Junio C Hamano
2017-01-27 22:12 ` Jeff King
2017-01-28 0:20 ` Junio C Hamano
2017-01-27 17:30 ` [PATCH v3 0/1] Support `git reset --stdin` Johannes Schindelin
2017-01-27 17:30 ` [PATCH v3 1/1] reset: support the --stdin option Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dc76476b-9ad5-a3b6-f12f-33cda2ca5814@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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.
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 NNTP newsgroup(s).