From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Piotr Krukowiecki <piotr.krukowiecki.news@gmail.com>,
Jay Soffian <jaysoffian@gmail.com>,
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>,
Miles Bader <miles@gnu.org>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 09/14] apply: add --stage option
Date: Mon, 14 Oct 2013 17:29:21 -0500 [thread overview]
Message-ID: <1381789769-9893-7-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1381789769-9893-1-git-send-email-felipe.contreras@gmail.com>
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..8c047ef 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -9,7 +9,7 @@ git-apply - Apply a patch to files and/or to the index
SYNOPSIS
--------
[verse]
-'git apply' [--stat] [--numstat] [--summary] [--check] [--index] [--3way]
+'git apply' [--stat] [--numstat] [--summary] [--check] [--index|--stage] [--3way]
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
@@ -67,6 +67,9 @@ OPTIONS
up-to-date, it is flagged as an error. This flag also
causes the index file to be updated.
+--stage::
+ Synonym for --index.
+
--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,
+ 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
next prev parent reply other threads:[~2013-10-14 22:36 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-14 22:29 [PATCH v2 14/14] completion: update 'git reset' new stage options Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 04/14] grep: add --staged option Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 07/14] stash: add --stage to pop and apply Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 00/14] Officially start moving to the term 'staging area' Felipe Contreras
2013-10-14 22:51 ` Felipe Contreras
2013-10-17 19:50 ` Junio C Hamano
2013-10-17 21:50 ` Felipe Contreras
2013-10-18 9:46 ` Matthieu Moy
2013-10-18 10:26 ` John Szakmeister
2013-10-18 10:36 ` Felipe Contreras
2013-10-18 11:38 ` Max Horn
2013-10-18 23:28 ` Karsten Blees
2013-10-19 0:41 ` Felipe Contreras
2013-10-19 14:08 ` Philip Oakley
2013-10-24 0:57 ` Karsten Blees
2013-10-24 8:32 ` Andreas Krey
2013-10-24 23:19 ` Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 10/14] apply: add --work, --no-work options Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 01/14] Add proper 'stage' command Felipe Contreras
2013-10-14 23:06 ` Eric Sunshine
2013-10-14 23:15 ` Felipe Contreras
2013-10-14 22:29 ` Felipe Contreras [this message]
2013-10-14 22:29 ` [PATCH v2 03/14] diff: document --staged Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 05/14] rm: add --staged option Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 02/14] stage: add edit command Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 13/14] reset: allow --keep with --stage Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 12/14] reset: add --stage and --work options Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 08/14] submodule: add --staged options Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 11/14] completion: update " Felipe Contreras
2013-10-14 22:29 ` [PATCH v2 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=1381789769-9893-7-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--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).