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>, Miles Bader <miles@gnu.org>,
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>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH try2 05/14] rm: add --staged option
Date: Sat, 12 Oct 2013 02:04:42 -0500 [thread overview]
Message-ID: <1381561488-20294-9-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1381561488-20294-1-git-send-email-felipe.contreras@gmail.com>
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 1d876c2..156b40d 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 0df0b4d..919911f 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -268,6 +268,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_BOOLEAN( 0 , "cached", &index_only, N_("only remove from the index")),
+ OPT_BOOLEAN( 0 , "staged", &index_only, N_("only remove from the index")),
OPT__FORCE(&force, N_("override the up-to-date check")),
OPT_BOOLEAN('r', NULL, &recursive, N_("allow recursive removal")),
OPT_BOOLEAN( 0 , "ignore-unmatch", &ignore_unmatch,
--
1.8.4-fc
next prev parent reply other threads:[~2013-10-12 7:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 7:04 [PATCH try2 14/14] completion: update 'git reset' new stage options Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 04/14] grep: add --staged option Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 07/14] stash: add --stage to pop and apply Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 00/14] Officially start moving to the term 'staging area' Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 10/14] apply: add --work, --no-work options Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 01/14] Add proper 'stage' command Felipe Contreras
2013-10-14 19:44 ` Eric Sunshine
2013-10-14 22:22 ` Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 09/14] apply: add --stage option Felipe Contreras
2013-10-13 9:53 ` Eric Sunshine
2013-10-13 10:16 ` Felipe Contreras
2013-10-13 10:19 ` Miles Bader
2013-10-13 10:31 ` Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 03/14] diff: document --staged Felipe Contreras
2013-10-12 7:04 ` Felipe Contreras [this message]
2013-10-12 7:04 ` [PATCH try2 02/14] stage: add edit command Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 13/14] reset: allow --keep with --stage Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 12/14] reset: add --stage and --work options Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 08/14] submodule: add --staged options Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 11/14] completion: update " Felipe Contreras
2013-10-12 7:04 ` [PATCH try2 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=1381561488-20294-9-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).