[PATCH v2 try2 09/14] apply: add --stage option
From: Felipe Contreras <hidden>
Date: 2016-06-15 23:00:50
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Synonym for --index. Signed-off-by: Felipe Contreras <redacted> --- 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