From: jari.aalto@cante.net
To: git@vger.kernel.org
Cc: Jari Aalto <jari.aalto@cante.net>
Subject: [PATCH] git-rm.txt: Order options alphabetically
Date: Wed, 1 Dec 2010 17:44:50 +0200 [thread overview]
Message-ID: <1291218290-13159-1-git-send-email-jari.aalto@cante.net> (raw)
From: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
Documentation/git-rm.txt | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 71e3d9f..5478e0c 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -22,29 +22,31 @@ When `--cached` is given, the staged content has to
match either the tip of the branch or the file on disk,
allowing the file to be removed from just the index.
-
OPTIONS
-------
-<file>...::
- Files to remove. Fileglobs (e.g. `*.c`) can be given to
- remove all matching files. If you want git to expand
- file glob characters, you may need to shell-escape them.
- A leading directory name
- (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be
- given to remove all files in the directory, and recursively
- all sub-directories,
- but this requires the `-r` option to be explicitly given.
+
+--cached::
+ Use this option to unstage and remove paths only from the index.
+ Working tree files, whether modified or not, will be
+ left alone.
-f::
--force::
Override the up-to-date check.
+--ignore-unmatch::
+ Exit with a zero status even if no files matched.
+
-n::
--dry-run::
Don't actually remove any file(s). Instead, just show
if they exist in the index and would otherwise be removed
by the command.
+-q::
+--quiet::
+ `git rm` normally outputs one line (in the form of an `rm` command)
+ for each file removed. This option suppresses that output.
-r::
Allow recursive removal when a leading directory name is
given.
@@ -54,19 +56,15 @@ OPTIONS
the list of files, (useful when filenames might be mistaken
for command-line options).
---cached::
- Use this option to unstage and remove paths only from the index.
- Working tree files, whether modified or not, will be
- left alone.
-
---ignore-unmatch::
- Exit with a zero status even if no files matched.
-
--q::
---quiet::
- `git rm` normally outputs one line (in the form of an `rm` command)
- for each file removed. This option suppresses that output.
-
+<file>...::
+ Files to remove. Fileglobs (e.g. `*.c`) can be given to
+ remove all matching files. If you want git to expand
+ file glob characters, you may need to shell-escape them.
+ A leading directory name
+ (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be
+ given to remove all files in the directory, and recursively
+ all sub-directories,
+ but this requires the `-r` option to be explicitly given.
DISCUSSION
----------
--
1.7.2.3
reply other threads:[~2010-12-01 15:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291218290-13159-1-git-send-email-jari.aalto@cante.net \
--to=jari.aalto@cante.net \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).