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]
|
2020-01-16 16:09:18 +00:00
|
|
|
'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <pathspec>...
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2020-01-16 16:09:18 +00:00
|
|
|
Remove files matching pathspec from the index, or from the working tree
|
|
|
|
and the index. `git rm` will not remove a file from just your working
|
|
|
|
directory. (There is no option to remove a file only from the working
|
|
|
|
tree 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,
|
2008-04-16 23:41:27 +00:00
|
|
|
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
|
|
|
|
-------
|
2020-01-16 16:09:18 +00:00
|
|
|
<pathspec>...::
|
|
|
|
Files to remove. 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.
|
|
|
|
+
|
|
|
|
The command removes only the paths that are known to Git.
|
|
|
|
+
|
|
|
|
File globbing matches across directory boundaries. Thus, given two
|
|
|
|
directories `d` and `d2`, there is a difference between using
|
|
|
|
`git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all
|
|
|
|
of directory `d2`.
|
|
|
|
+
|
|
|
|
For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
|
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
|
|
|
|
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:
|
|
|
|
|
|
|
|
----------------
|
|
|
|
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
|
|
|
|
----------------
|
|
|
|
|
2013-08-06 19:15:25 +00:00
|
|
|
SUBMODULES
|
|
|
|
----------
|
2012-11-14 18:49:04 +00:00
|
|
|
Only submodules using a gitfile (which means they were cloned
|
2013-01-21 19:17:53 +00:00
|
|
|
with a Git version 1.7.8 or newer) will be removed from the work
|
2012-11-14 18:49:04 +00:00
|
|
|
tree, as their repository lives inside the .git directory of the
|
|
|
|
superproject. If a submodule (or one of those nested inside it)
|
2017-06-02 19:28:10 +00:00
|
|
|
still uses a .git directory, `git rm` will move the submodules
|
|
|
|
git directory into the superprojects git directory to protect
|
|
|
|
the submodule's history. If it exists the submodule.<name> section
|
|
|
|
in the linkgit:gitmodules[5] file will also be removed and that file
|
|
|
|
will be staged (unless --cached or -n are used).
|
2012-11-14 18:49:04 +00:00
|
|
|
|
2017-08-23 17:49:35 +00:00
|
|
|
A submodule is considered up to date when the HEAD is the same as
|
2012-11-14 18:49:04 +00:00
|
|
|
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.
|
|
|
|
|
2013-03-04 21:20:24 +00:00
|
|
|
If you only want to remove the local checkout of a submodule from your
|
2017-06-22 21:01:49 +00:00
|
|
|
work tree without committing the removal, use linkgit:git-submodule[1] `deinit`
|
|
|
|
instead. Also see linkgit:gitsubmodules[7] for details on submodule removal.
|
2013-03-04 21:20:24 +00:00
|
|
|
|
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
|
2013-01-21 19:17:53 +00:00
|
|
|
example; this lets Git, and not the shell, expand the pathnames
|
2008-04-16 23:41:27 +00:00
|
|
|
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
|
|
|
|
2014-01-07 21:32:37 +00:00
|
|
|
BUGS
|
|
|
|
----
|
|
|
|
Each time a superproject update removes a populated submodule
|
|
|
|
(e.g. when switching between commits before and after the removal) a
|
|
|
|
stale submodule checkout will remain in the old location. Removing the
|
|
|
|
old directory is only safe when it uses a gitfile, as otherwise the
|
|
|
|
history of the submodule will be deleted too. This step will be
|
|
|
|
obsolete when recursive submodule update has been implemented.
|
|
|
|
|
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
|