From: Eric Sunshine <sunshine@sunshineco.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Piotr Krukowiecki <piotr.krukowiecki.news@gmail.com>,
Jay Soffian <jaysoffian@gmail.com>, Miles Bader <miles@gnu.org>,
Jonathan Nieder <jrnieder@gmail.com>,
Philip Oakley <philipoakley@iee.org>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
William Swanson <swansontec@gmail.com>,
Ping Yin <pkufranky@gmail.com>,
Hilco Wijbenga <hilco.wijbenga@gmail.com>
Subject: Re: [PATCH try2 09/14] apply: add --stage option
Date: Sun, 13 Oct 2013 05:53:37 -0400 [thread overview]
Message-ID: <CAPig+cSmVKK_onR8NtLkdahkFci77SCsU6PagyJEBYLo4xZBUQ@mail.gmail.com> (raw)
In-Reply-To: <1381561488-20294-7-git-send-email-felipe.contreras@gmail.com>
On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras
<felipe.contreras@gmail.com> wrote:
> Synonym for --index.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> Documentation/git-apply.txt | 5 ++++-
> builtin/apply.c | 2 ++
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
> index f605327..ce44327 100644
> --- a/Documentation/git-apply.txt
> +++ b/Documentation/git-apply.txt
> @@ -12,7 +12,7 @@ SYNOPSIS
> 'git apply' [--stat] [--numstat] [--summary] [--check] [--index] [--3way]
> [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
> [--allow-binary-replacement | --binary] [--reject] [-z]
> - [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
> + [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached|--staged]
Here "staged".
> [--ignore-space-change | --ignore-whitespace ]
> [--whitespace=(nowarn|warn|fix|error|error-all)]
> [--exclude=<path>] [--include=<path>] [--directory=<root>]
> @@ -67,6 +67,9 @@ OPTIONS
> up-to-date, it is flagged as an error. This flag also
> causes the index file to be updated.
>
> +--staged::
> + Synonym for --index.
> +
Also "staged".
> --cached::
> Apply a patch without touching the working tree. Instead take the
> cached data, apply the patch, and store the result in the index
> diff --git a/builtin/apply.c b/builtin/apply.c
> index 50912c9..42b5a4b 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -4377,6 +4377,8 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
> N_("instead of applying the patch, see if the patch is applicable")),
> OPT_BOOLEAN(0, "index", &check_index,
> N_("make sure the patch is applicable to the current index")),
> + OPT_BOOLEAN(0, "stage", &check_index,
But here "stage".
> + N_("make sure the patch is applicable to the current index")),
> OPT_BOOLEAN(0, "cached", &cached,
> N_("apply a patch without touching the working tree")),
> OPT_BOOLEAN(0, "apply", &force_apply,
> --
> 1.8.4-fc
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2013-10-13 9:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 7:04 [PATCH try2 14/14] completion: update 'git reset' new stage options Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 04/14] grep: add --staged option Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 07/14] stash: add --stage to pop and apply Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 00/14] Officially start moving to the term 'staging area' Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 10/14] apply: add --work, --no-work options Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 01/14] Add proper 'stage' command Felipe Contreras
2013-10-14 19:44 ` Eric Sunshine
2013-10-14 22:22 ` Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 09/14] apply: add --stage option Felipe Contreras
2013-10-13 9:53 ` Eric Sunshine [this message]
2013-10-13 10:16 ` Felipe Contreras
2013-10-13 10:19 ` Miles Bader
2013-10-13 10:31 ` Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 03/14] diff: document --staged Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 05/14] rm: add --staged option Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 02/14] stage: add edit command Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 13/14] reset: allow --keep with --stage Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 12/14] reset: add --stage and --work options Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 08/14] submodule: add --staged options Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 11/14] completion: update " Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 06/14] stash: add --stage option to save Felipe Contreras
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=CAPig+cSmVKK_onR8NtLkdahkFci77SCsU6PagyJEBYLo4xZBUQ@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=hilco.wijbenga@gmail.com \
--cc=jaysoffian@gmail.com \
--cc=jrnieder@gmail.com \
--cc=miles@gnu.org \
--cc=philipoakley@iee.org \
--cc=piotr.krukowiecki.news@gmail.com \
--cc=pkufranky@gmail.com \
--cc=swansontec@gmail.com \
/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).