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

On Sun, Oct 13, 2013 at 4:53 AM, Eric Sunshine [off-list ref] wrote:

On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras
[off-list ref] wrote:

quoted

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..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".

quoted

          [--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".

quoted

 --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".

Right. Should be "staged".

-- 
Felipe Contreras