2006-02-21 23:04:51 +00:00
|
|
|
git-rm(1)
|
|
|
|
=========
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2006-03-09 16:24:50 +00:00
|
|
|
git-rm - Remove files from the working tree and from the index
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2011-07-02 02:38:26 +00:00
|
|
|
[verse]
|
2008-08-08 22:37:02 +00:00
|
|
|
'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2008-04-16 23:41:27 +00:00
|
|
|
Remove files from the index, or from the working tree and the index.
|
2009-12-07 18:26:57 +00:00
|
|
|
`git rm` will not remove a file from just your working directory.
|
2009-12-07 18:35:42 +00:00
|
|
|
(There is no option to remove a file only from the working tree
|
2008-04-16 23:41:27 +00:00
|
|
|
and yet keep it in the index; use `/bin/rm` if you want to do that.)
|
|
|
|
The files being removed have to be identical to the tip of the branch,
|
|
|
|
and no updates to their contents can be staged in the index,
|
|
|
|
though that default behavior can be overridden with the `-f` option.
|
2009-12-07 18:26:57 +00:00
|
|
|
When `--cached` is given, the staged content has to
|
2008-04-16 23:41:27 +00:00
|
|
|
match either the tip of the branch or the file on disk,
|
|
|
|
allowing the file to be removed from just the index.
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
-------
|
|
|
|
<file>...::
|
2006-12-25 11:23:45 +00:00
|
|
|
Files to remove. Fileglobs (e.g. `*.c`) can be given to
|
2008-04-16 23:41:27 +00:00
|
|
|
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.
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
-f::
|
2008-08-08 22:37:02 +00:00
|
|
|
--force::
|
2006-12-25 11:23:45 +00:00
|
|
|
Override the up-to-date check.
|
2006-02-21 23:04:51 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-n::
|
|
|
|
--dry-run::
|
2008-04-16 23:41:27 +00:00
|
|
|
Don't actually remove any file(s). Instead, just show
|
|
|
|
if they exist in the index and would otherwise be removed
|
|
|
|
by the command.
|
2006-02-21 23:04:51 +00:00
|
|
|
|
2006-12-25 11:23:45 +00:00
|
|
|
-r::
|
|
|
|
Allow recursive removal when a leading directory name is
|
|
|
|
given.
|
2006-02-21 23:04:51 +00:00
|
|
|
|
2006-05-05 19:05:24 +00:00
|
|
|
\--::
|
2006-02-21 23:04:51 +00:00
|
|
|
This option can be used to separate command-line options from
|
|
|
|
the list of files, (useful when filenames might be mistaken
|
|
|
|
for command-line options).
|
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
--cached::
|
2008-04-16 23:41:27 +00:00
|
|
|
Use this option to unstage and remove paths only from the index.
|
|
|
|
Working tree files, whether modified or not, will be
|
|
|
|
left alone.
|
2006-12-25 11:23:45 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
--ignore-unmatch::
|
2007-04-16 07:53:24 +00:00
|
|
|
Exit with a zero status even if no files matched.
|
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-q::
|
|
|
|
--quiet::
|
2009-12-07 18:26:57 +00:00
|
|
|
`git rm` normally outputs one line (in the form of an `rm` command)
|
2007-04-16 07:46:48 +00:00
|
|
|
for each file removed. This option suppresses that output.
|
|
|
|
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
DISCUSSION
|
|
|
|
----------
|
|
|
|
|
2008-04-16 23:41:27 +00:00
|
|
|
The <file> list given to the command can be exact pathnames,
|
|
|
|
file glob patterns, or leading directory names. The command
|
|
|
|
removes only the paths that are known to git. Giving the name of
|
2006-12-25 11:23:45 +00:00
|
|
|
a file that you have not told git about does not remove that file.
|
2006-02-21 23:04:51 +00:00
|
|
|
|
2008-04-16 23:41:27 +00:00
|
|
|
File globbing matches across directory boundaries. Thus, given
|
|
|
|
two directories `d` and `d2`, there is a difference between
|
docs: stop using asciidoc no-inline-literal
In asciidoc 7, backticks like `foo` produced a typographic
effect, but did not otherwise affect the syntax. In asciidoc
8, backticks introduce an "inline literal" inside which markup
is not interpreted. To keep compatibility with existing
documents, asciidoc 8 has a "no-inline-literal" attribute to
keep the old behavior. We enabled this so that the
documentation could be built on either version.
It has been several years now, and asciidoc 7 is no longer
in wide use. We can now decide whether or not we want
inline literals on their own merits, which are:
1. The source is much easier to read when the literal
contains punctuation. You can use `master~1` instead
of `master{tilde}1`.
2. They are less error-prone. Because of point (1), we
tend to make mistakes and forget the extra layer of
quoting.
This patch removes the no-inline-literal attribute from the
Makefile and converts every use of backticks in the
documentation to an inline literal (they must be cleaned up,
or the example above would literally show "{tilde}" in the
output).
Problematic sites were found by grepping for '`.*[{\\]' and
examined and fixed manually. The results were then verified
by comparing the output of "html2text" on the set of
generated html pages. Doing so revealed that in addition to
making the source more readable, this patch fixes several
formatting bugs:
- HTML rendering used the ellipsis character instead of
literal "..." in code examples (like "git log A...B")
- some code examples used the right-arrow character
instead of '->' because they failed to quote
- api-config.txt did not quote tilde, and the resulting
HTML contained a bogus snippet like:
<tt><sub></tt> foo <tt></sub>bar</tt>
which caused some parsers to choke and omit whole
sections of the page.
- git-commit.txt confused ``foo`` (backticks inside a
literal) with ``foo'' (matched double-quotes)
- mentions of `A U Thor <author@example.com>` used to
erroneously auto-generate a mailto footnote for
author@example.com
- the description of --word-diff=plain incorrectly showed
the output as "[-removed-] and {added}", not "{+added+}".
- using "prime" notation like:
commit `C` and its replacement `C'`
confused asciidoc into thinking that everything between
the first backtick and the final apostrophe were meant
to be inside matched quotes
- asciidoc got confused by the escaping of some of our
asterisks. In particular,
`credential.\*` and `credential.<url>.\*`
properly escaped the asterisk in the first case, but
literally passed through the backslash in the second
case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 08:51:57 +00:00
|
|
|
using `git rm 'd*'` and `git rm 'd/*'`, as the former will
|
2008-04-16 23:41:27 +00:00
|
|
|
also remove all of directory `d2`.
|
2006-02-21 23:04:51 +00:00
|
|
|
|
2009-12-07 18:35:42 +00:00
|
|
|
REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM
|
|
|
|
--------------------------------------------------------
|
|
|
|
There is no option for `git rm` to remove from the index only
|
|
|
|
the paths that have disappeared from the filesystem. However,
|
|
|
|
depending on the use case, there are several ways that can be
|
|
|
|
done.
|
|
|
|
|
2010-12-07 09:07:11 +00:00
|
|
|
Using ``git commit -a''
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~~~
|
2009-12-07 18:35:42 +00:00
|
|
|
If you intend that your next commit should record all modifications
|
|
|
|
of tracked files in the working tree and record all removals of
|
|
|
|
files that have been removed from the working tree with `rm`
|
|
|
|
(as opposed to `git rm`), use `git commit -a`, as it will
|
|
|
|
automatically notice and record all removals. You can also have a
|
|
|
|
similar effect without committing by using `git add -u`.
|
|
|
|
|
2010-12-07 09:07:11 +00:00
|
|
|
Using ``git add -A''
|
|
|
|
~~~~~~~~~~~~~~~~~~~~
|
2009-12-07 18:35:42 +00:00
|
|
|
When accepting a new code drop for a vendor branch, you probably
|
|
|
|
want to record both the removal of paths and additions of new paths
|
|
|
|
as well as modifications of existing paths.
|
|
|
|
|
|
|
|
Typically you would first remove all tracked files from the working
|
|
|
|
tree using this command:
|
|
|
|
|
2012-09-26 18:21:13 +00:00
|
|
|
Submodules
|
|
|
|
~~~~~~~~~~
|
|
|
|
Only submodules using a gitfile (which means they were cloned
|
|
|
|
with a git version 1.7.8 or newer) will be removed from the work
|
|
|
|
tree, as their repository lives inside the .git directory of the
|
|
|
|
superproject. If a submodule (or one of those nested inside it)
|
|
|
|
still uses a .git directory, `git rm` will fail - no matter if forced
|
|
|
|
or not - to protect the submodule's history.
|
|
|
|
|
|
|
|
A submodule is considered up-to-date when the HEAD is the same as
|
|
|
|
recorded in the index, no tracked files are modified and no untracked
|
|
|
|
files that aren't ignored are present in the submodules work tree.
|
|
|
|
Ignored files are deemed expendable and won't stop a submodule's work
|
|
|
|
tree from being removed.
|
|
|
|
|
2009-12-07 18:35:42 +00:00
|
|
|
----------------
|
|
|
|
git ls-files -z | xargs -0 rm -f
|
|
|
|
----------------
|
|
|
|
|
2010-12-07 09:07:11 +00:00
|
|
|
and then untar the new code in the working tree. Alternately
|
|
|
|
you could 'rsync' the changes into the working tree.
|
2009-12-07 18:35:42 +00:00
|
|
|
|
|
|
|
After that, the easiest way to record all removals, additions, and
|
|
|
|
modifications in the working tree is:
|
|
|
|
|
|
|
|
----------------
|
|
|
|
git add -A
|
|
|
|
----------------
|
|
|
|
|
|
|
|
See linkgit:git-add[1].
|
|
|
|
|
|
|
|
Other ways
|
|
|
|
~~~~~~~~~~
|
|
|
|
If all you really want to do is to remove from the index the files
|
|
|
|
that are no longer present in the working tree (perhaps because
|
|
|
|
your working tree is dirty so that you cannot use `git commit -a`),
|
|
|
|
use the following command:
|
|
|
|
|
|
|
|
----------------
|
|
|
|
git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached
|
|
|
|
----------------
|
|
|
|
|
2006-02-21 23:04:51 +00:00
|
|
|
EXAMPLES
|
|
|
|
--------
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-04 02:13:29 +00:00
|
|
|
`git rm Documentation/\*.txt`::
|
2010-08-20 10:30:24 +00:00
|
|
|
Removes all `*.txt` files from the index that are under the
|
2007-01-16 19:50:29 +00:00
|
|
|
`Documentation` directory and any of its subdirectories.
|
2006-02-21 23:04:51 +00:00
|
|
|
+
|
2010-08-20 10:30:24 +00:00
|
|
|
Note that the asterisk `*` is quoted from the shell in this
|
2008-04-16 23:41:27 +00:00
|
|
|
example; this lets git, and not the shell, expand the pathnames
|
|
|
|
of files and subdirectories under the `Documentation/` directory.
|
2006-02-21 23:04:51 +00:00
|
|
|
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-04 02:13:29 +00:00
|
|
|
`git rm -f git-*.sh`::
|
2007-01-16 19:50:29 +00:00
|
|
|
Because this example lets the shell expand the asterisk
|
|
|
|
(i.e. you are listing the files explicitly), it
|
2006-12-25 11:23:45 +00:00
|
|
|
does not remove `subdir/git-foo.sh`.
|
2006-02-21 23:04:51 +00:00
|
|
|
|
2008-05-28 23:55:27 +00:00
|
|
|
SEE ALSO
|
2006-03-05 21:18:19 +00:00
|
|
|
--------
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-add[1]
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 07:07:32 +00:00
|
|
|
Part of the linkgit:git[1] suite
|