[PATCH v2 try2 05/14] rm: add --staged option
Synonym for --cached.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/git-rm.txt | 5 ++++-
builtin/rm.c | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index f1efc11..458880b 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -8,7 +8,7 @@ git-rm - Remove files from the working tree and from the index
SYNOPSIS
--------
[verse]
-'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
+'git rm' [-f | --force] [-n] [-r] [--cached | --staged] [--ignore-unmatch] [--quiet] [--] <file>...
DESCRIPTION
-----------
@@ -60,6 +60,9 @@ OPTIONS
Working tree files, whether modified or not, will be
left alone.
+--staged::
+ Synonym for --cached.
+
--ignore-unmatch::
Exit with a zero status even if no files matched.
diff --git a/builtin/rm.c b/builtin/rm.c
index 0564218..657314e 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -269,6 +269,7 @@ static struct option builtin_rm_options[] = {
OPT__DRY_RUN(&show_only, N_("dry run")),
OPT__QUIET(&quiet, N_("do not list removed files")),
OPT_BOOL( 0 , "cached", &index_only, N_("only remove from the index")),
+ OPT_BOOL( 0 , "staged", &index_only, N_("only remove from the index")),
OPT__FORCE(&force, N_("override the up-to-date check")),
OPT_BOOL('r', NULL, &recursive, N_("allow recursive removal")),
OPT_BOOL( 0 , "ignore-unmatch", &ignore_unmatch,
--
1.9.2+fc1.2.gfbaae8c
Felipe Contreras <felipe.contreras@gmail.com>