diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-31 13:25:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-31 13:25:53 -0700 |
| commit | c14e6ad9a230ad90c84b7f620d87fbe49a2d0342 (patch) | |
| tree | 120346dc383e3d1c4219fe8c533eb22cb6af2b55 /git-rm.html | |
| parent | 2a4bcbc355496c8d83b1b9f8892c4cbe8f584158 (diff) | |
| download | git-htmldocs-c14e6ad9a230ad90c84b7f620d87fbe49a2d0342.tar.gz | |
Autogenerated HTML docs for v2.2.0-rc0
Diffstat (limited to 'git-rm.html')
| -rw-r--r-- | git-rm.html | 92 |
1 files changed, 45 insertions, 47 deletions
diff --git a/git-rm.html b/git-rm.html index dbcebefcf..43894a828 100644 --- a/git-rm.html +++ b/git-rm.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.6" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git-rm(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +87,16 @@ ul, ol, li > p { ul > li { color: #aaa; }
ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
+pre {
+ white-space: pre-wrap;
+}
#author {
color: #527bbd;
@@ -219,7 +225,7 @@ div.exampleblock > div.content { }
div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
a.image:visited { color: white; }
dl {
@@ -349,7 +355,7 @@ div.colist td img { margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -407,18 +413,14 @@ span.underline { text-decoration: underline; } span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
+div.unbreakable { page-break-inside: avoid; }
+
/*
* xhtml11 specific
*
* */
-tt {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -452,12 +454,6 @@ div.tableblock > table[frame="vsides"] { *
* */
-.monospaced {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -537,6 +533,8 @@ body.manpage div.sectionbody { @media print {
body.manpage div#toc { display: none; }
}
+
+
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -610,7 +608,7 @@ toc: function (toclevels) { var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName == 'div'
+ if (entry.nodeName.toLowerCase() == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -656,7 +654,7 @@ footnotes: function () { var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -759,13 +757,13 @@ git-rm(1) Manual Page <h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Remove files from the index, or from the working tree and the index.
-<tt>git rm</tt> will not remove a file from just your working directory.
+<code>git rm</code> 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 <tt>/bin/rm</tt> if you want to do that.)
+and yet keep it in the index; use <code>/bin/rm</code> 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 <tt>-f</tt> option.
-When <tt>--cached</tt> is given, the staged content has to
+though that default behavior can be overridden with the <code>-f</code> option.
+When <code>--cached</code> 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.</p></div>
</div>
@@ -779,14 +777,14 @@ allowing the file to be removed from just the index.</p></div> </dt>
<dd>
<p>
- Files to remove. Fileglobs (e.g. <tt>*.c</tt>) can be given to
+ Files to remove. Fileglobs (e.g. <code>*.c</code>) 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. <tt>dir</tt> to remove <tt>dir/file1</tt> and <tt>dir/file2</tt>) can be
+ (e.g. <code>dir</code> to remove <code>dir/file1</code> and <code>dir/file2</code>) can be
given to remove all files in the directory, and recursively
all sub-directories,
- but this requires the <tt>-r</tt> option to be explicitly given.
+ but this requires the <code>-r</code> option to be explicitly given.
</p>
</dd>
<dt class="hdlist1">
@@ -858,7 +856,7 @@ allowing the file to be removed from just the index.</p></div> </dt>
<dd>
<p>
- <tt>git rm</tt> normally outputs one line (in the form of an <tt>rm</tt> command)
+ <code>git rm</code> normally outputs one line (in the form of an <code>rm</code> command)
for each file removed. This option suppresses that output.
</p>
</dd>
@@ -873,15 +871,15 @@ file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of
a file that you have not told Git about does not remove that file.</p></div>
<div class="paragraph"><p>File globbing matches across directory boundaries. Thus, given
-two directories <tt>d</tt> and <tt>d2</tt>, there is a difference between
-using <tt>git rm 'd*'</tt> and <tt>git rm 'd/*'</tt>, as the former will
-also remove all of directory <tt>d2</tt>.</p></div>
+two directories <code>d</code> and <code>d2</code>, there is a difference between
+using <code>git rm 'd*'</code> and <code>git rm 'd/*'</code>, as the former will
+also remove all of directory <code>d2</code>.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_removing_files_that_have_disappeared_from_the_filesystem">REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM</h2>
<div class="sectionbody">
-<div class="paragraph"><p>There is no option for <tt>git rm</tt> to remove from the index only
+<div class="paragraph"><p>There is no option for <code>git rm</code> 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.</p></div>
@@ -889,10 +887,10 @@ done.</p></div> <h3 id="_using_8220_git_commit_a_8221">Using “git commit -a”</h3>
<div class="paragraph"><p>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 <tt>rm</tt>
-(as opposed to <tt>git rm</tt>), use <tt>git commit -a</tt>, as it will
+files that have been removed from the working tree with <code>rm</code>
+(as opposed to <code>git rm</code>), use <code>git commit -a</code>, as it will
automatically notice and record all removals. You can also have a
-similar effect without committing by using <tt>git add -u</tt>.</p></div>
+similar effect without committing by using <code>git add -u</code>.</p></div>
</div>
<div class="sect2">
<h3 id="_using_8220_git_add_a_8221">Using “git add -A”</h3>
@@ -903,7 +901,7 @@ as well as modifications of existing paths.</p></div> tree using this command:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>git ls-files -z | xargs -0 rm -f</tt></pre>
+<pre><code>git ls-files -z | xargs -0 rm -f</code></pre>
</div></div>
<div class="paragraph"><p>and then untar the new code in the working tree. Alternately
you could <em>rsync</em> the changes into the working tree.</p></div>
@@ -911,7 +909,7 @@ you could <em>rsync</em> the changes into the working tree.</p></div> modifications in the working tree is:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>git add -A</tt></pre>
+<pre><code>git add -A</code></pre>
</div></div>
<div class="paragraph"><p>See <a href="git-add.html">git-add(1)</a>.</p></div>
</div>
@@ -919,11 +917,11 @@ modifications in the working tree is:</p></div> <h3 id="_other_ways">Other ways</h3>
<div class="paragraph"><p>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 <tt>git commit -a</tt>),
+your working tree is dirty so that you cannot use <code>git commit -a</code>),
use the following command:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached</tt></pre>
+<pre><code>git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached</code></pre>
</div></div>
</div>
</div>
@@ -935,7 +933,7 @@ use the following command:</p></div> 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, <tt>git rm</tt> will fail - no matter if forced
+still uses a .git directory, <code>git rm</code> will fail - no matter if forced
or not - to protect the submodule’s history. If it exists the
submodule.<name> section in the <a href="gitmodules.html">gitmodules(5)</a> file will also
be removed and that file will be staged (unless --cached or -n are used).</p></div>
@@ -946,7 +944,7 @@ Ignored files are deemed expendable and won’t stop a submodule’s wor tree from being removed.</p></div>
<div class="paragraph"><p>If you only want to remove the local checkout of a submodule from your
work tree without committing the removal,
-use <a href="git-submodule.html">git-submodule(1)</a> <tt>deinit</tt> instead.</p></div>
+use <a href="git-submodule.html">git-submodule(1)</a> <code>deinit</code> instead.</p></div>
</div>
</div>
<div class="sect1">
@@ -954,25 +952,25 @@ use <a href="git-submodule.html">git-submodule(1)</a> <tt>deinit</tt> instead.</ <div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
-<tt>git rm Documentation/\*.txt</tt>
+<code>git rm Documentation/\*.txt</code>
</dt>
<dd>
<p>
- Removes all <tt>*.txt</tt> files from the index that are under the
- <tt>Documentation</tt> directory and any of its subdirectories.
+ Removes all <code>*.txt</code> files from the index that are under the
+ <code>Documentation</code> directory and any of its subdirectories.
</p>
-<div class="paragraph"><p>Note that the asterisk <tt>*</tt> is quoted from the shell in this
+<div class="paragraph"><p>Note that the asterisk <code>*</code> is quoted from the shell in this
example; this lets Git, and not the shell, expand the pathnames
-of files and subdirectories under the <tt>Documentation/</tt> directory.</p></div>
+of files and subdirectories under the <code>Documentation/</code> directory.</p></div>
</dd>
<dt class="hdlist1">
-<tt>git rm -f git-*.sh</tt>
+<code>git rm -f git-*.sh</code>
</dt>
<dd>
<p>
Because this example lets the shell expand the asterisk
(i.e. you are listing the files explicitly), it
- does not remove <tt>subdir/git-foo.sh</tt>.
+ does not remove <code>subdir/git-foo.sh</code>.
</p>
</dd>
</dl></div>
|