diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-12-08 02:06:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-12-08 02:06:14 +0000 |
| commit | 28e6d1f42c813caecf9c05f855e0d17184e01b62 (patch) | |
| tree | 10af6044cb2cf9ec4af8afdc8d6c146daf822c64 /git-rm.html | |
| parent | 2e6ded8990e867c457680899597363f3c1dd07f6 (diff) | |
| download | git-htmldocs-28e6d1f42c813caecf9c05f855e0d17184e01b62.tar.gz | |
Autogenerated HTML docs for v1.7.3.3-402-ga48aa
Diffstat (limited to 'git-rm.html')
| -rw-r--r-- | git-rm.html | 228 |
1 files changed, 161 insertions, 67 deletions
diff --git a/git-rm.html b/git-rm.html index 582e75dcf..7c8159483 100644 --- a/git-rm.html +++ b/git-rm.html @@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>git-rm(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
- margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { padding: 0.5em;
}
-div.listingblock {
- margin-right: 0%;
-}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
-div.quoteblock > div.content {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { padding: 0.5em;
}
-div.verseblock div.content {
- white-space: pre;
-}
-
div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { tfoot {
font-weight: bold;
}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
-div.hlist {
+
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
+}
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
}
-td.hlist1 {
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-rm(1)</title>
</head>
<body>
<div id="header">
@@ -318,13 +412,13 @@ git-rm(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
-<div class="para"><p><em>git rm</em> [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>…</p></div>
+<div class="paragraph"><p><em>git rm</em> [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>…</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>Remove files from the index, or from the working tree and the index.
+<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.
(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.)
@@ -337,8 +431,8 @@ allowing the file to be removed from just the index.</p></div> </div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
<file>…
</dt>
<dd>
@@ -353,10 +447,10 @@ allowing the file to be removed from just the index.</p></div> but this requires the <tt>-r</tt> option to be explicitly given.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-f
</dt>
-<dt>
+<dt class="hdlist1">
--force
</dt>
<dd>
@@ -364,20 +458,20 @@ allowing the file to be removed from just the index.</p></div> Override the up-to-date check.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-n
</dt>
-<dt>
+<dt class="hdlist1">
--dry-run
</dt>
<dd>
<p>
- Don't actually remove any file(s). Instead, just show
+ Don’t actually remove any file(s). Instead, just show
if they exist in the index and would otherwise be removed
by the command.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-r
</dt>
<dd>
@@ -386,7 +480,7 @@ allowing the file to be removed from just the index.</p></div> given.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--
</dt>
<dd>
@@ -396,7 +490,7 @@ allowing the file to be removed from just the index.</p></div> for command-line options).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--cached
</dt>
<dd>
@@ -406,7 +500,7 @@ allowing the file to be removed from just the index.</p></div> left alone.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--ignore-unmatch
</dt>
<dd>
@@ -414,10 +508,10 @@ allowing the file to be removed from just the index.</p></div> Exit with a zero status even if no files matched.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-q
</dt>
-<dt>
+<dt class="hdlist1">
--quiet
</dt>
<dd>
@@ -430,11 +524,11 @@ allowing the file to be removed from just the index.</p></div> </div>
<h2 id="_discussion">DISCUSSION</h2>
<div class="sectionbody">
-<div class="para"><p>The <file> list given to the command can be exact pathnames,
+<div class="paragraph"><p>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
a file that you have not told git about does not remove that file.</p></div>
-<div class="para"><p>File globbing matches across directory boundaries. Thus, given
+<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
@@ -442,38 +536,38 @@ also remove all of directory <tt>d2</tt>.</p></div> </div>
<h2 id="_removing_files_that_have_disappeared_from_the_filesystem">REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM</h2>
<div class="sectionbody">
-<div class="para"><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 <tt>git rm</tt> 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>
-<h3 id="_using_git_commit_a">Using "git commit -a"</h3><div style="clear:left"></div>
-<div class="para"><p>If you intend that your next commit should record all modifications
+<h3 id="_using_8220_git_commit_a_8221">Using “git commit -a”</h3><div style="clear:left"></div>
+<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
automatically notice and record all removals. You can also have a
similar effect without committing by using <tt>git add -u</tt>.</p></div>
-<h3 id="_using_git_add_a">Using "git add -A"</h3><div style="clear:left"></div>
-<div class="para"><p>When accepting a new code drop for a vendor branch, you probably
+<h3 id="_using_8220_git_add_a_8221">Using “git add -A”</h3><div style="clear:left"></div>
+<div class="paragraph"><p>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.</p></div>
-<div class="para"><p>Typically you would first remove all tracked files from the working
+<div class="paragraph"><p>Typically you would first remove all tracked files from the working
tree using this command:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>git ls-files -z | xargs -0 rm -f</tt></pre>
</div></div>
-<div class="para"><p>and then "untar" the new code in the working tree. Alternately
-you could "rsync" the changes into the working tree.</p></div>
-<div class="para"><p>After that, the easiest way to record all removals, additions, and
+<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>
+<div class="paragraph"><p>After that, the easiest way to record all removals, additions, and
modifications in the working tree is:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>git add -A</tt></pre>
</div></div>
-<div class="para"><p>See <a href="git-add.html">git-add(1)</a>.</p></div>
+<div class="paragraph"><p>See <a href="git-add.html">git-add(1)</a>.</p></div>
<h3 id="_other_ways">Other ways</h3><div style="clear:left"></div>
-<div class="para"><p>If all you really want to do is to remove from the index the files
+<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>),
use the following command:</p></div>
@@ -484,20 +578,20 @@ use the following command:</p></div> </div>
<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
-git rm Documentation/*.txt
+<div class="dlist"><dl>
+<dt class="hdlist1">
+git rm Documentation/\*.txt
</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.
</p>
-<div class="para"><p>Note that the asterisk <tt>*</tt> is quoted from the shell in this
+<div class="paragraph"><p>Note that the asterisk <tt>*</tt> 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>
</dd>
-<dt>
+<dt class="hdlist1">
git rm -f git-*.sh
</dt>
<dd>
@@ -511,23 +605,23 @@ git rm -f git-*.sh </div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<div class="para"><p><a href="git-add.html">git-add(1)</a></p></div>
+<div class="paragraph"><p><a href="git-add.html">git-add(1)</a></p></div>
</div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>
+<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div>
</div>
<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
+<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-18 23:56:56 UTC
+Last updated 2010-12-08 02:06:00 UTC
</div>
</div>
</body>
|