git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 try2 09/14] apply: add --stage option

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Apr 25, 2014, 18:12 UTC
Message-ID
<1398449567-16314-10-git-send-email-felipe.contreras@gmail.com>
In-Reply-To
<1398449567-16314-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 b0d0986..a97363c 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_BOOL(0, "index", &check_index,
 			N_("make sure the patch is applicable to the current index")),
+		OPT_BOOL(0, "stage", &check_index,
+			N_("make sure the patch is applicable to the current index")),
 		OPT_BOOL(0, "cached", &cached,
 			N_("apply a patch without touching the working tree")),
 		OPT_BOOL(0, "apply", &force_apply,

-- 
1.9.2+fc1.2.gfbaae8c
Previous: Felipe ContrerasNext: Felipe Contreras
Message 10 of 16 in “Officially start moving to the term 'staging area'”
  1. 00/14 Officially start moving to the term 'staging area'Felipe Contreras, Apr 25, 2014
  2. 01/14 Add proper 'stage' commandFelipe Contreras, Apr 25, 2014
  3. 02/14 stage: add edit commandFelipe Contreras, Apr 25, 2014
  4. 03/14 diff: document --stagedFelipe Contreras, Apr 25, 2014
  5. 04/14 grep: add --staged optionFelipe Contreras, Apr 25, 2014
  6. 05/14 rm: add --staged optionFelipe Contreras, Apr 25, 2014
  7. 06/14 stash: add --stage option to saveFelipe Contreras, Apr 25, 2014
  8. 07/14 stash: add --stage to pop and applyFelipe Contreras, Apr 25, 2014
  9. 08/14 submodule: add --staged optionsFelipe Contreras, Apr 25, 2014
  10. 09/14 apply: add --stage optionFelipe Contreras, Apr 25, 2014
  11. 10/14 apply: add --work, --no-work optionsFelipe Contreras, Apr 25, 2014
  12. 11/14 completion: update --staged optionsFelipe Contreras, Apr 25, 2014
  13. 12/14 reset: add --stage and --work optionsFelipe Contreras, Apr 25, 2014
  14. 13/14 reset: allow --keep with --stageFelipe Contreras, Apr 25, 2014
  15. 14/14 completion: update 'git reset' new stage optionsFelipe Contreras, Apr 25, 2014
  16. Hilco WijbengaApr 26, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.