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(-)
Show changes to Documentation/git-rm.txt +21 −20
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
jari.aalto@cante.net