--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+ border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+ margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+ font-style: italic;\r
+}\r
+\r
+strong {\r
+ font-weight: bold;\r
+}\r
+\r
+tt {\r
+ color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ margin-top: 1.2em;\r
+ margin-bottom: 0.5em;\r
+ line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+ border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+ border-bottom: 2px solid silver;\r
+ padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+ font-family: serif;\r
+ margin-left: 0;\r
+}\r
+\r
+hr {\r
+ border: 1px solid silver;\r
+}\r
+\r
+p {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+ padding: 0;\r
+ margin: 0;\r
+}\r
+\r
+span#author {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+ font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+ font-family: sans-serif;\r
+ font-size: small;\r
+ border-top: 2px solid silver;\r
+ padding-top: 0.5em;\r
+ margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+ float: left;\r
+ padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+ float: right;\r
+ padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+ margin-right: 10%;\r
+ margin-top: 1.5em;\r
+ margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+ margin-top: 2.5em;\r
+ margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+ padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ text-align: left;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+ margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+ margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+ padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+ text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+ vertical-align: top;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ text-decoration: underline;\r
+ color: #527bbd;\r
+ padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+ padding-left: 0.5em;\r
+ border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+ border-left: 2px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+ white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+dt {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0;\r
+ font-style: italic;\r
+}\r
+dd > *:first-child {\r
+ margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+ list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+ list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+ border-color: #527bbd;\r
+ border-width: 3px;\r
+}\r
+thead {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+}\r
+tfoot {\r
+ font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+ vertical-align: top;\r
+ font-style: italic;\r
+ padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+ vertical-align: top;\r
+}\r
+\r
+@media print {\r
+ div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ margin-top: 0.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+ padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+ border-left: 2px solid silver;\r
+ padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>git-pack-refs(1)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+git-pack-refs(1) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>git-pack-refs -\r
+ Pack heads and tags for efficient repository access\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p><em>git-pack-refs</em> [--all] [--prune]</p>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>Traditionally, tips of branches and tags (collectively known as\r
+<em>refs</em>) were stored one file per ref under <tt>$GIT_DIR/refs</tt>\r
+directory. While many branch tips tend to be updated often,\r
+most tags and some branch tips are never updated. When a\r
+repository has hundreds or thousands of tags, this\r
+one-file-per-ref format both wastes storage and hurts\r
+performance.</p>\r
+<p>This command is used to solve the storage and performance\r
+problem by stashing the refs in a single file,\r
+<tt>$GIT_DIR/packed-refs</tt>. When a ref is missing from the\r
+traditional <tt>$GIT_DIR/refs</tt> hierarchy, it is looked up in this\r
+file and used if found.</p>\r
+<p>Subsequent updates to branches always creates new file under\r
+<tt>$GIT_DIR/refs</tt> hierarchy.</p>\r
+</div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+--all\r
+</dt>\r
+<dd>\r
+<p>\r
+The command by default packs all tags and leaves branch tips\r
+alone. This is because branches are expected to be actively\r
+developed and packing their tips does not help performance.\r
+This option causes branch tips to be packed as well. Useful for\r
+a repository with many branches of historical interests.\r
+</p>\r
+</dd>\r
+<dt>\r
+--prune\r
+</dt>\r
+<dd>\r
+<p>\r
+After packing the refs, remove loose refs under <tt>$GIT_DIR/refs</tt>\r
+hierarchy. This should probably become default.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Author</h2>\r
+<div class="sectionbody">\r
+<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 07-Nov-2006 07:19:02 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r
--- /dev/null
+git-pack-refs(1)
+================
+
+NAME
+----
+git-pack-refs - Pack heads and tags for efficient repository access
+
+SYNOPSIS
+--------
+'git-pack-refs' [--all] [--prune]
+
+DESCRIPTION
+-----------
+
+Traditionally, tips of branches and tags (collectively known as
+'refs') were stored one file per ref under `$GIT_DIR/refs`
+directory. While many branch tips tend to be updated often,
+most tags and some branch tips are never updated. When a
+repository has hundreds or thousands of tags, this
+one-file-per-ref format both wastes storage and hurts
+performance.
+
+This command is used to solve the storage and performance
+problem by stashing the refs in a single file,
+`$GIT_DIR/packed-refs`. When a ref is missing from the
+traditional `$GIT_DIR/refs` hierarchy, it is looked up in this
+file and used if found.
+
+Subsequent updates to branches always creates new file under
+`$GIT_DIR/refs` hierarchy.
+
+OPTIONS
+-------
+
+\--all::
+
+The command by default packs all tags and leaves branch tips
+alone. This is because branches are expected to be actively
+developed and packing their tips does not help performance.
+This option causes branch tips to be packed as well. Useful for
+a repository with many branches of historical interests.
+
+\--prune::
+
+After packing the refs, remove loose refs under `$GIT_DIR/refs`
+hierarchy. This should probably become default.
+
+Author
+------
+Written by Linus Torvalds <torvalds@osdl.org>
+
+GIT
+---
+Part of the gitlink:git[7] suite
/\r
D---E---F---G master</tt></pre>\r
</div></div>\r
-<p>While, starting from the same point, the result of either of the following\r
-commands:</p>\r
+<p>The latter form is just a short-hand of <tt>git checkout topic</tt>\r
+followed by <tt>git rebase master</tt>.</p>\r
+<p>Here is how you would transplant a topic branch based on one\r
+branch to another, to pretend that you forked the topic branch\r
+from the latter branch, using <tt>rebase --onto</tt>.</p>\r
+<p>First let's assume your <em>topic</em> is based on branch <em>next</em>.\r
+For example feature developed in <em>topic</em> depends on some\r
+functionality which is found in <em>next</em>.</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> o---o---o---o---o master\r
+ \\r
+ o---o---o---o---o next\r
+ \\r
+ o---o---o topic</tt></pre>\r
+</div></div>\r
+<p>We would want to make <em>topic</em> forked from branch <em>master</em>,\r
+for example because the functionality <em>topic</em> branch depend on\r
+got merged into more stable <em>master</em> branch, like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> o---o---o---o---o master\r
+ | \\r
+ | o'--o'--o' topic\r
+ \\r
+ o---o---o---o---o next</tt></pre>\r
+</div></div>\r
+<p>We can get this using the following command:</p>\r
<div class="literalblock">\r
<div class="content">\r
-<pre><tt>git-rebase --onto master~1 master\r
-git-rebase --onto master~1 master topic</tt></pre>\r
+<pre><tt>git-rebase --onto master next topic</tt></pre>\r
</div></div>\r
-<p>would be:</p>\r
+<p>Another example of --onto option is to rebase part of a\r
+branch. If we have the following situation:</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt> A'--B'--C' topic\r
- /\r
- D---E---F---G master</tt></pre>\r
+<pre><tt> H---I---J topicB\r
+ /\r
+ E---F---G topicA\r
+ /\r
+ A---B---C---D master</tt></pre>\r
+</div></div>\r
+<p>then the command</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>git-rebase --onto master topicA topicB</tt></pre>\r
+</div></div>\r
+<p>would result in:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> H'--I'--J' topicB\r
+ /\r
+ | E---F---G topicA\r
+ |/\r
+ A---B---C---D master</tt></pre>\r
</div></div>\r
+<p>This is useful when topicB does not depend on topicA.</p>\r
<p>In case of conflict, git-rebase will stop at the first problematic commit\r
and leave conflict markers in the tree. You can use git diff to locate\r
the markers (<<<<<<) and make edits to resolve the conflict. For each\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Oct-2006 05:58:40 UTC\r
+Last updated 07-Nov-2006 07:19:02 UTC\r
</div>\r
</div>\r
</body>\r
D---E---F---G master
------------
-While, starting from the same point, the result of either of the following
-commands:
+The latter form is just a short-hand of `git checkout topic`
+followed by `git rebase master`.
- git-rebase --onto master~1 master
- git-rebase --onto master~1 master topic
+Here is how you would transplant a topic branch based on one
+branch to another, to pretend that you forked the topic branch
+from the latter branch, using `rebase --onto`.
-would be:
+First let's assume your 'topic' is based on branch 'next'.
+For example feature developed in 'topic' depends on some
+functionality which is found in 'next'.
------------
- A'--B'--C' topic
- /
- D---E---F---G master
+ o---o---o---o---o master
+ \
+ o---o---o---o---o next
+ \
+ o---o---o topic
+------------
+
+We would want to make 'topic' forked from branch 'master',
+for example because the functionality 'topic' branch depend on
+got merged into more stable 'master' branch, like this:
+
+------------
+ o---o---o---o---o master
+ | \
+ | o'--o'--o' topic
+ \
+ o---o---o---o---o next
------------
+We can get this using the following command:
+
+ git-rebase --onto master next topic
+
+
+Another example of --onto option is to rebase part of a
+branch. If we have the following situation:
+
+------------
+ H---I---J topicB
+ /
+ E---F---G topicA
+ /
+ A---B---C---D master
+------------
+
+then the command
+
+ git-rebase --onto master topicA topicB
+
+would result in:
+
+------------
+ H'--I'--J' topicB
+ /
+ | E---F---G topicA
+ |/
+ A---B---C---D master
+------------
+
+This is useful when topicB does not depend on topicA.
+
In case of conflict, git-rebase will stop at the first problematic commit
and leave conflict markers in the tree. You can use git diff to locate
the markers (<<<<<<) and make edits to resolve the conflict. For each
</p>\r
</dd>\r
<dt>\r
+<a href="git-pack-refs.html">git-pack-refs(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Pack heads and tags for efficient repository access.\r
+</p>\r
+</dd>\r
+<dt>\r
<a href="git-pull.html">git-pull(1)</a>\r
</dt>\r
<dd>\r
</p>\r
</dd>\r
<dt>\r
+<a href="git-show-ref.html">git-show-ref(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+ List references in a local repository.\r
+</p>\r
+</dd>\r
+<dt>\r
<a href="git-tar-tree.html">git-tar-tree(1)</a>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-Oct-2006 20:47:13 UTC\r
+Last updated 07-Nov-2006 07:19:03 UTC\r
</div>\r
</div>\r
</body>\r
gitlink:git-mv[1]::
Move or rename a file, a directory, or a symlink.
+gitlink:git-pack-refs[1]::
+ Pack heads and tags for efficient repository access.
+
gitlink:git-pull[1]::
Fetch from and merge with a remote repository or a local branch.
gitlink:git-show-index[1]::
Displays contents of a pack idx file.
+gitlink:git-show-ref[1]::
+ List references in a local repository.
+
gitlink:git-tar-tree[1]::
Creates a tar archive of the files in the named tree object.