handling).
core.ignoreStat::
- The working copy files are assumed to stay unchanged until you
- mark them otherwise manually - Git will not detect the file changes
- by lstat() calls. This is useful on systems where those are very
- slow, such as Microsoft Windows. See linkgit:git-update-index[1].
+ If true, commands which modify both the working tree and the index
+ will mark the updated paths with the "assume unchanged" bit in the
+ index. These marked files are then assumed to stay unchanged in the
+ working copy, until you mark them otherwise manually - Git will not
+ detect the file changes by lstat() calls. This is useful on systems
+ where those are very slow, such as Microsoft Windows.
+ See linkgit:git-update-index[1].
False by default.
core.preferSymlinkRefs::
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:52 UTC\r
+Last updated 01-Jun-2008 08:21:56 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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
-/* 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 for CVS users</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>git for CVS users</h1>\r
-</div>\r
-<div id="preamble">\r
-<div class="sectionbody">\r
-<p>Git differs from CVS in that every working tree contains a repository with\r
-a full copy of the project history, and no repository is inherently more\r
-important than any other. However, you can emulate the CVS model by\r
-designating a single shared repository which people can synchronize with;\r
-this document explains how to do that.</p>\r
-<p>Some basic familiarity with git is required. This\r
-<a href="tutorial.html">tutorial introduction to git</a> and the\r
-<a href="glossary.html">git glossary</a> should be sufficient.</p>\r
-</div>\r
-</div>\r
-<h2>Developing against a shared repository</h2>\r
-<div class="sectionbody">\r
-<p>Suppose a shared repository is set up in /pub/repo.git on the host\r
-foo.com. Then as an individual committer you can clone the shared\r
-repository over ssh with:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git clone foo.com:/pub/repo.git/ my-project\r
-$ cd my-project</tt></pre>\r
-</div></div>\r
-<p>and hack away. The equivalent of <tt>cvs update</tt> is</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git pull origin</tt></pre>\r
-</div></div>\r
-<p>which merges in any work that others might have done since the clone\r
-operation. If there are uncommitted changes in your working tree, commit\r
-them first before running git pull.</p>\r
-<div class="admonitionblock">\r
-<table><tr>\r
-<td class="icon">\r
-<div class="title">Note</div>\r
-</td>\r
-<td class="content">\r
-<p>The <tt>pull</tt> command knows where to get updates from because of certain\r
-configuration variables that were set by the first <tt>git clone</tt>\r
-command; see <tt>git config -l</tt> and the <a href="git-config.html">git-config(1)</a> man\r
-page for details.</p>\r
-</td>\r
-</tr></table>\r
-</div>\r
-<p>You can update the shared repository with your changes by first committing\r
-your changes, and then using the <a href="git-push.html">git-push(1)</a> command:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git push origin master</tt></pre>\r
-</div></div>\r
-<p>to "push" those commits to the shared repository. If someone else has\r
-updated the repository more recently, <tt>git push</tt>, like <tt>cvs commit</tt>, will\r
-complain, in which case you must pull any changes before attempting the\r
-push again.</p>\r
-<p>In the <tt>git push</tt> command above we specify the name of the remote branch\r
-to update (<tt>master</tt>). If we leave that out, <tt>git push</tt> tries to update\r
-any branches in the remote repository that have the same name as a branch\r
-in the local repository. So the last <tt>push</tt> can be done with either of:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git push origin\r
-$ git push foo.com:/pub/project.git/</tt></pre>\r
-</div></div>\r
-<p>as long as the shared repository does not have any branches\r
-other than <tt>master</tt>.</p>\r
-</div>\r
-<h2>Setting Up a Shared Repository</h2>\r
-<div class="sectionbody">\r
-<p>We assume you have already created a git repository for your project,\r
-possibly created from scratch or from a tarball (see the\r
-<a href="tutorial.html">tutorial</a>), or imported from an already existing CVS\r
-repository (see the next section).</p>\r
-<p>Assume your existing repo is at /home/alice/myproject. Create a new "bare"\r
-repository (a repository without a working tree) and fetch your project into\r
-it:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ mkdir /pub/my-repo.git\r
-$ cd /pub/my-repo.git\r
-$ git --bare init --shared\r
-$ git --bare fetch /home/alice/myproject master:master</tt></pre>\r
-</div></div>\r
-<p>Next, give every team member read/write access to this repository. One\r
-easy way to do this is to give all the team members ssh access to the\r
-machine where the repository is hosted. If you don't want to give them a\r
-full shell on the machine, there is a restricted shell which only allows\r
-users to do git pushes and pulls; see <a href="git-shell.html">git-shell(1)</a>.</p>\r
-<p>Put all the committers in the same group, and make the repository\r
-writable by that group:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ chgrp -R $group /pub/my-repo.git</tt></pre>\r
-</div></div>\r
-<p>Make sure committers have a umask of at most 027, so that the directories\r
-they create are writable and searchable by other group members.</p>\r
-</div>\r
-<h2>Importing a CVS archive</h2>\r
-<div class="sectionbody">\r
-<p>First, install version 2.1 or higher of cvsps from\r
-<a href="http://www.cobite.com/cvsps/">http://www.cobite.com/cvsps/</a> and make\r
-sure it is in your path. Then cd to a checked out CVS working directory\r
-of the project you are interested in and run <a href="git-cvsimport.html">git-cvsimport(1)</a>:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git cvsimport -C <destination> <module></tt></pre>\r
-</div></div>\r
-<p>This puts a git archive of the named CVS module in the directory\r
-<destination>, which will be created if necessary.</p>\r
-<p>The import checks out from CVS every revision of every file. Reportedly\r
-cvsimport can average some twenty revisions per second, so for a\r
-medium-sized project this should not take more than a couple of minutes.\r
-Larger projects or remote repositories may take longer.</p>\r
-<p>The main trunk is stored in the git branch named <tt>origin</tt>, and additional\r
-CVS branches are stored in git branches with the same names. The most\r
-recent version of the main trunk is also left checked out on the <tt>master</tt>\r
-branch, so you can start adding your own changes right away.</p>\r
-<p>The import is incremental, so if you call it again next month it will\r
-fetch any CVS updates that have been made in the meantime. For this to\r
-work, you must not modify the imported branches; instead, create new\r
-branches for your own changes, and merge in the imported branches as\r
-necessary.</p>\r
-</div>\r
-<h2>Advanced Shared Repository Management</h2>\r
-<div class="sectionbody">\r
-<p>Git allows you to specify scripts called "hooks" to be run at certain\r
-points. You can use these, for example, to send all commits to the shared\r
-repository to a mailing list. See <a href="githooks.html">githooks(5)</a>[Hooks used by git].</p>\r
-<p>You can enforce finer grained permissions using update hooks. See\r
-<a href="howto/update-hook-example.txt">Controlling access to branches using\r
-update hooks</a>.</p>\r
-</div>\r
-<h2>Providing CVS Access to a git Repository</h2>\r
-<div class="sectionbody">\r
-<p>It is also possible to provide true CVS access to a git repository, so\r
-that developers can still use CVS; see <a href="git-cvsserver.html">git-cvsserver(1)</a> for\r
-details.</p>\r
-</div>\r
-<h2>Alternative Development Models</h2>\r
-<div class="sectionbody">\r
-<p>CVS users are accustomed to giving a group of developers commit access to\r
-a common repository. As we've seen, this is also possible with git.\r
-However, the distributed nature of git allows other development models,\r
-and you may want to first consider whether one of them might be a better\r
-fit for your project.</p>\r
-<p>For example, you can choose a single person to maintain the project's\r
-primary public repository. Other developers then clone this repository\r
-and each work in their own clone. When they have a series of changes that\r
-they're happy with, they ask the maintainer to pull from the branch\r
-containing the changes. The maintainer reviews their changes and pulls\r
-them into the primary repository, which other developers pull from as\r
-necessary to stay coordinated. The Linux kernel and other projects use\r
-variants of this model.</p>\r
-<p>With a small group, developers may just pull changes from each other's\r
-repositories without the need for a central maintainer.</p>\r
-</div>\r
-<div id="footer">\r
-<div id="footer-text">\r
-Last updated 14-May-2008 22:24:44 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:10 UTC\r
+Last updated 01-Jun-2008 08:21:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Apr-2008 16:08:38 UTC\r
+Last updated 01-Jun-2008 08:21:59 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:32 UTC\r
+Last updated 01-Jun-2008 08:20:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-Mar-2008 10:38:32 UTC\r
+Last updated 01-Jun-2008 08:20:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Feb-2008 10:47:41 UTC\r
+Last updated 01-Jun-2008 08:20:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:01 UTC\r
+Last updated 01-Jun-2008 08:20:53 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-applymbox(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-applymbox(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-applymbox -\r
- Apply a series of patches in a mailbox\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-applymbox</em> [-u] [-k] [-q] [-m] ( -c .dotest/<num> | <mbox> ) [ <signoff> ]</p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>Splits mail messages in a mailbox into commit log message,\r
-authorship information and patches, and applies them to the\r
-current branch.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
--q\r
-</dt>\r
-<dd>\r
-<p>\r
- Apply patches interactively. The user will be given\r
- opportunity to edit the log message and the patch before\r
- attempting to apply it.\r
-</p>\r
-</dd>\r
-<dt>\r
--k\r
-</dt>\r
-<dd>\r
-<p>\r
- Usually the program <em>cleans up</em> the Subject: header line\r
- to extract the title line for the commit log message,\r
- among which (1) remove <em>Re:</em> or <em>re:</em>, (2) leading\r
- whitespaces, (3) <em>[</em> up to <em>]</em>, typically <em>[PATCH]</em>, and\r
- then prepends "[PATCH] ". This flag forbids this\r
- munging, and is most useful when used to read back <em>git\r
- format-patch -k</em> output.\r
-</p>\r
-</dd>\r
-<dt>\r
--m\r
-</dt>\r
-<dd>\r
-<p>\r
- Patches are applied with <tt>git-apply</tt> command, and unless\r
- it cleanly applies without fuzz, the processing fails.\r
- With this flag, if a tree that the patch applies cleanly\r
- is found in a repository, the patch is applied to the\r
- tree and then a 3-way merge between the resulting tree\r
- and the current tree.\r
-</p>\r
-</dd>\r
-<dt>\r
--u\r
-</dt>\r
-<dd>\r
-<p>\r
- Pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).\r
- The proposed commit log message taken from the e-mail\r
- are re-coded into UTF-8 encoding (configuration variable\r
- <tt>i18n.commitencoding</tt> can be used to specify project's\r
- preferred encoding if it is not UTF-8). This used to be\r
- optional but now it is the default.\r
-</p>\r
-<p>Note that the patch is always used as-is without charset\r
-conversion, even with this flag.</p>\r
-</dd>\r
-<dt>\r
--n\r
-</dt>\r
-<dd>\r
-<p>\r
- Pass <tt>-n</tt> flag to <tt>git-mailinfo</tt> (see\r
- <a href="git-mailinfo.html">git-mailinfo(1)</a>).\r
-</p>\r
-</dd>\r
-<dt>\r
--c .dotest/<num>\r
-</dt>\r
-<dd>\r
-<p>\r
- When the patch contained in an e-mail does not cleanly\r
- apply, the command exits with an error message. The\r
- patch and extracted message are found in .dotest/, and\r
- you could re-run <em>git applymbox</em> with <em>-c .dotest/<num></em>\r
- flag to restart the process after inspecting and fixing\r
- them.\r
-</p>\r
-</dd>\r
-<dt>\r
-<mbox>\r
-</dt>\r
-<dd>\r
-<p>\r
- The name of the file that contains the e-mail messages\r
- with patches. This file should be in the UNIX mailbox\r
- format. See <em>SubmittingPatches</em> document to learn about\r
- the formatting convention for e-mail submission.\r
-</p>\r
-</dd>\r
-<dt>\r
-<signoff>\r
-</dt>\r
-<dd>\r
-<p>\r
- The name of the file that contains your "Signed-off-by"\r
- line. See <em>SubmittingPatches</em> document to learn what\r
- "Signed-off-by" line means. You can also just say\r
- <em>yes</em>, <em>true</em>, <em>me</em>, or <em>please</em> to use an automatically\r
- generated "Signed-off-by" line based on your committer\r
- identity.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>SEE ALSO</h2>\r
-<div class="sectionbody">\r
-<p><a href="git-am.html">git-am(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>.</p>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.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 02-Jun-2007 21:09:23 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
+++ /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-applypatch(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-applypatch(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-applypatch -\r
- Apply one patch extracted from an e-mail\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-applypatch</em> <msg> <patch> <info> [<signoff>]</p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>This is usually not what an end user wants to run directly. See\r
-<a href="git-am.html">git-am(1)</a> instead.</p>\r
-<p>Takes three files <msg>, <patch>, and <info> prepared from an\r
-e-mail message by <em>git-mailinfo</em>, and creates a commit. It is\r
-usually not necessary to use this command directly.</p>\r
-<p>This command can run <tt>applypatch-msg</tt>, <tt>pre-applypatch</tt>, and\r
-<tt>post-applypatch</tt> hooks. See <a href="hooks.html">hooks</a> for more\r
-information.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
-<msg>\r
-</dt>\r
-<dd>\r
-<p>\r
- Commit log message (sans the first line, which comes\r
- from e-mail Subject stored in <info>).\r
-</p>\r
-</dd>\r
-<dt>\r
-<patch>\r
-</dt>\r
-<dd>\r
-<p>\r
- The patch to apply.\r
-</p>\r
-</dd>\r
-<dt>\r
-<info>\r
-</dt>\r
-<dd>\r
-<p>\r
- Author and subject information extracted from e-mail,\r
- used on "author" line and as the first line of the\r
- commit log message.\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>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.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 02-Jun-2007 21:09:23 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:01 UTC\r
+Last updated 01-Jun-2008 08:20:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:01 UTC\r
+Last updated 01-Jun-2008 08:20:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-May-2008 03:29:14 UTC\r
+Last updated 01-Jun-2008 08:20:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Feb-2008 10:47:41 UTC\r
+Last updated 01-Jun-2008 08:20:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-May-2008 06:34:57 UTC\r
+Last updated 01-Jun-2008 08:20:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 28-May-2008 08:06:40 UTC\r
+Last updated 01-Jun-2008 08:20:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:43 UTC\r
+Last updated 01-Jun-2008 08:20:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:04 UTC\r
+Last updated 01-Jun-2008 08:20:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:05 UTC\r
+Last updated 01-Jun-2008 08:20:58 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:04 UTC\r
+Last updated 01-Jun-2008 08:20:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 28-Apr-2008 08:40:12 UTC\r
+Last updated 01-Jun-2008 08:20:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-May-2008 05:45:36 UTC\r
+Last updated 01-Jun-2008 08:20:58 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:32 UTC\r
+Last updated 01-Jun-2008 08:20:58 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:06 UTC\r
+Last updated 01-Jun-2008 08:20:59 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:06 UTC\r
+Last updated 01-Jun-2008 08:20:59 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-clone-pack(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-clone-pack(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-clone-pack -\r
- Clones a repository by receiving packed objects\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-clone-pack</em> [--exec=<git-upload-pack>] [<host>:]<directory> [<head>…]</p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>Clones a repository into the current repository by invoking\r
-<em>git-upload-pack</em>, possibly on the remote host via ssh, in\r
-the named repository, and stores the sent pack in the local\r
-repository.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
---exec=<git-upload-pack>\r
-</dt>\r
-<dd>\r
-<p>\r
- Use this to specify the path to <em>git-upload-pack</em> on the\r
- remote side, if it is not found on your $PATH.\r
- Installations of sshd ignore the user's environment\r
- setup scripts for login shells (e.g. .bash_profile) and\r
- your privately installed git may not be found on the system\r
- default $PATH. Another workaround suggested is to set\r
- up your $PATH in ".bashrc", but this flag is for people\r
- who do not want to pay the overhead for non-interactive\r
- shells by having a lean .bashrc file (they set most of\r
- the things up in .bash_profile).\r
-</p>\r
-</dd>\r
-<dt>\r
-<host>\r
-</dt>\r
-<dd>\r
-<p>\r
- A remote host that houses the repository. When this\r
- part is specified, <em>git-upload-pack</em> is invoked via\r
- ssh.\r
-</p>\r
-</dd>\r
-<dt>\r
-<directory>\r
-</dt>\r
-<dd>\r
-<p>\r
- The repository to sync from.\r
-</p>\r
-</dd>\r
-<dt>\r
-<head>…\r
-</dt>\r
-<dd>\r
-<p>\r
- The heads to update. This is relative to $GIT_DIR\r
- (e.g. "HEAD", "refs/heads/master"). When unspecified,\r
- all heads are updated to match the remote repository.\r
-</p>\r
-<p>Usually all the refs from existing repository are stored\r
-under the same name in the new repository. Giving explicit\r
-<head> arguments instead writes the object names and refs to\r
-the standard output, just like get-fetch-pack does.</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>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano.</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 10-Mar-2006 00:31:22 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Apr-2008 16:08:34 UTC\r
+Last updated 01-Jun-2008 08:20:59 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:32 UTC\r
+Last updated 01-Jun-2008 08:21:00 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-May-2008 22:24:40 UTC\r
+Last updated 01-Jun-2008 08:21:00 UTC\r
</div>\r
</div>\r
</body>\r
</dt>\r
<dd>\r
<p>\r
- The working copy files are assumed to stay unchanged until you\r
- mark them otherwise manually - Git will not detect the file changes\r
- by lstat() calls. This is useful on systems where those are very\r
- slow, such as Microsoft Windows. See <a href="git-update-index.html">git-update-index(1)</a>.\r
+ If true, commands which modify both the working tree and the index\r
+ will mark the updated paths with the "assume unchanged" bit in the\r
+ index. These marked files are then assumed to stay unchanged in the\r
+ working copy, until you mark them otherwise manually - Git will not\r
+ detect the file changes by lstat() calls. This is useful on systems\r
+ where those are very slow, such as Microsoft Windows.\r
+ See <a href="git-update-index.html">git-update-index(1)</a>.\r
False by default.\r
</p>\r
</dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:43 UTC\r
+Last updated 01-Jun-2008 08:21:00 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-convert-objects(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-convert-objects(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-convert-objects -\r
- Converts old-style git repository\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-convert-objects</em></p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>Converts old-style git repository to the latest format</p>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.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 19-Jul-2007 02:09:35 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:09 UTC\r
+Last updated 01-Jun-2008 08:21:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:43 UTC\r
+Last updated 01-Jun-2008 08:21:02 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Mar-2008 01:59:55 UTC\r
+Last updated 01-Jun-2008 08:21:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:44 UTC\r
+Last updated 01-Jun-2008 08:21:06 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-May-2008 00:52:46 UTC\r
+Last updated 01-Jun-2008 08:21:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-May-2008 22:24:41 UTC\r
+Last updated 01-Jun-2008 08:21:09 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-May-2008 07:44:12 UTC\r
+Last updated 01-Jun-2008 08:21:09 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:45 UTC\r
+Last updated 01-Jun-2008 08:21:12 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-diff-stages(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-diff-stages(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-diff-stages -\r
- Compares two merge stages in the index\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-diff-stages</em> [<common diff options>] <stage1> <stage2> [<path>…]</p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>DEPRECATED and will be removed in 1.5.1.</p>\r
-<p>Compares the content and mode of the blobs in two stages in an\r
-unmerged index file.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
--p\r
-</dt>\r
-<dd>\r
-<p>\r
- Generate patch (see section on generating patches)\r
-</p>\r
-</dd>\r
-<dt>\r
--u\r
-</dt>\r
-<dd>\r
-<p>\r
- Synonym for "-p".\r
-</p>\r
-</dd>\r
-<dt>\r
---raw\r
-</dt>\r
-<dd>\r
-<p>\r
- Generate the raw format.\r
-</p>\r
-</dd>\r
-<dt>\r
---patch-with-raw\r
-</dt>\r
-<dd>\r
-<p>\r
- Synonym for "-p --raw".\r
-</p>\r
-</dd>\r
-<dt>\r
---stat[=width[,name-width]]\r
-</dt>\r
-<dd>\r
-<p>\r
- Generate a diffstat. You can override the default\r
- output width for 80-column terminal by "--stat=width".\r
- The width of the filename part can be controlled by\r
- giving another width to it separated by a comma.\r
-</p>\r
-</dd>\r
-<dt>\r
---numstat\r
-</dt>\r
-<dd>\r
-<p>\r
- Similar to --stat, but shows number of added and\r
- deleted lines in decimal notation and pathname without\r
- abbreviation, to make it more machine friendly. For\r
- binary files, outputs two <tt>-</tt> instead of saying\r
- <tt>0 0</tt>.\r
-</p>\r
-</dd>\r
-<dt>\r
---shortstat\r
-</dt>\r
-<dd>\r
-<p>\r
- Output only the last line of the --stat format containing total\r
- number of modified files, as well as number of added and deleted\r
- lines.\r
-</p>\r
-</dd>\r
-<dt>\r
---summary\r
-</dt>\r
-<dd>\r
-<p>\r
- Output a condensed summary of extended header information\r
- such as creations, renames and mode changes.\r
-</p>\r
-</dd>\r
-<dt>\r
---patch-with-stat\r
-</dt>\r
-<dd>\r
-<p>\r
- Synonym for "-p --stat".\r
-</p>\r
-</dd>\r
-<dt>\r
--z\r
-</dt>\r
-<dd>\r
-<p>\r
- \0 line termination on output\r
-</p>\r
-</dd>\r
-<dt>\r
---name-only\r
-</dt>\r
-<dd>\r
-<p>\r
- Show only names of changed files.\r
-</p>\r
-</dd>\r
-<dt>\r
---name-status\r
-</dt>\r
-<dd>\r
-<p>\r
- Show only names and status of changed files.\r
-</p>\r
-</dd>\r
-<dt>\r
---color\r
-</dt>\r
-<dd>\r
-<p>\r
- Show colored diff.\r
-</p>\r
-</dd>\r
-<dt>\r
---no-color\r
-</dt>\r
-<dd>\r
-<p>\r
- Turn off colored diff, even when the configuration file\r
- gives the default to color output.\r
-</p>\r
-</dd>\r
-<dt>\r
---color-words\r
-</dt>\r
-<dd>\r
-<p>\r
- Show colored word diff, i.e. color words which have changed.\r
-</p>\r
-</dd>\r
-<dt>\r
---no-renames\r
-</dt>\r
-<dd>\r
-<p>\r
- Turn off rename detection, even when the configuration\r
- file gives the default to do so.\r
-</p>\r
-</dd>\r
-<dt>\r
---check\r
-</dt>\r
-<dd>\r
-<p>\r
- Warn if changes introduce trailing whitespace\r
- or an indent that uses a space before a tab.\r
-</p>\r
-</dd>\r
-<dt>\r
---full-index\r
-</dt>\r
-<dd>\r
-<p>\r
- Instead of the first handful characters, show full\r
- object name of pre- and post-image blob on the "index"\r
- line when generating a patch format output.\r
-</p>\r
-</dd>\r
-<dt>\r
---binary\r
-</dt>\r
-<dd>\r
-<p>\r
- In addition to --full-index, output "binary diff" that\r
- can be applied with "git apply".\r
-</p>\r
-</dd>\r
-<dt>\r
---abbrev[=<n>]\r
-</dt>\r
-<dd>\r
-<p>\r
- Instead of showing the full 40-byte hexadecimal object\r
- name in diff-raw format output and diff-tree header\r
- lines, show only handful hexdigits prefix. This is\r
- independent of --full-index option above, which controls\r
- the diff-patch output format. Non default number of\r
- digits can be specified with --abbrev=<n>.\r
-</p>\r
-</dd>\r
-<dt>\r
--B\r
-</dt>\r
-<dd>\r
-<p>\r
- Break complete rewrite changes into pairs of delete and create.\r
-</p>\r
-</dd>\r
-<dt>\r
--M\r
-</dt>\r
-<dd>\r
-<p>\r
- Detect renames.\r
-</p>\r
-</dd>\r
-<dt>\r
--C\r
-</dt>\r
-<dd>\r
-<p>\r
- Detect copies as well as renames.\r
-</p>\r
-</dd>\r
-<dt>\r
---diff-filter=[ACDMRTUXB*]\r
-</dt>\r
-<dd>\r
-<p>\r
- Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),\r
- Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their\r
- type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are\r
- Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).\r
- Any combination of the filter characters may be used.\r
- When <tt>*</tt> (All-or-none) is added to the combination, all\r
- paths are selected if there is any file that matches\r
- other criteria in the comparison; if there is no file\r
- that matches other criteria, nothing is selected.\r
-</p>\r
-</dd>\r
-<dt>\r
---find-copies-harder\r
-</dt>\r
-<dd>\r
-<p>\r
- For performance reasons, by default, -C option finds copies only\r
- if the original file of the copy was modified in the same\r
- changeset. This flag makes the command\r
- inspect unmodified files as candidates for the source of\r
- copy. This is a very expensive operation for large\r
- projects, so use it with caution.\r
-</p>\r
-</dd>\r
-<dt>\r
--l<num>\r
-</dt>\r
-<dd>\r
-<p>\r
- -M and -C options require O(n^2) processing time where n\r
- is the number of potential rename/copy targets. This\r
- option prevents rename/copy detection from running if\r
- the number of rename/copy targets exceeds the specified\r
- number.\r
-</p>\r
-</dd>\r
-<dt>\r
--S<string>\r
-</dt>\r
-<dd>\r
-<p>\r
- Look for differences that contain the change in <string>.\r
-</p>\r
-</dd>\r
-<dt>\r
---pickaxe-all\r
-</dt>\r
-<dd>\r
-<p>\r
- When -S finds a change, show all the changes in that\r
- changeset, not just the files that contain the change\r
- in <string>.\r
-</p>\r
-</dd>\r
-<dt>\r
---pickaxe-regex\r
-</dt>\r
-<dd>\r
-<p>\r
- Make the <string> not a plain string but an extended POSIX\r
- regex to match.\r
-</p>\r
-</dd>\r
-<dt>\r
--O<orderfile>\r
-</dt>\r
-<dd>\r
-<p>\r
- Output the patch in the order specified in the\r
- <orderfile>, which has one shell glob pattern per line.\r
-</p>\r
-</dd>\r
-<dt>\r
--R\r
-</dt>\r
-<dd>\r
-<p>\r
- Swap two inputs; that is, show differences from index or\r
- on-disk file to tree contents.\r
-</p>\r
-</dd>\r
-<dt>\r
---text\r
-</dt>\r
-<dd>\r
-<p>\r
- Treat all files as text.\r
-</p>\r
-</dd>\r
-<dt>\r
--a\r
-</dt>\r
-<dd>\r
-<p>\r
- Shorthand for "--text".\r
-</p>\r
-</dd>\r
-<dt>\r
---ignore-space-change\r
-</dt>\r
-<dd>\r
-<p>\r
- Ignore changes in amount of white space. This ignores white\r
- space at line end, and consider all other sequences of one or\r
- more white space characters to be equivalent.\r
-</p>\r
-</dd>\r
-<dt>\r
--b\r
-</dt>\r
-<dd>\r
-<p>\r
- Shorthand for "--ignore-space-change".\r
-</p>\r
-</dd>\r
-<dt>\r
---ignore-all-space\r
-</dt>\r
-<dd>\r
-<p>\r
- Ignore white space when comparing lines. This ignores\r
- difference even if one line has white space where the other\r
- line has none.\r
-</p>\r
-</dd>\r
-<dt>\r
--w\r
-</dt>\r
-<dd>\r
-<p>\r
- Shorthand for "--ignore-all-space".\r
-</p>\r
-</dd>\r
-</dl>\r
-<p>For more detailed explanation on these common options, see also\r
-<a href="diffcore.html">diffcore documentation</a>.</p>\r
-<dl>\r
-<dt>\r
-<stage1>,<stage2>\r
-</dt>\r
-<dd>\r
-<p>\r
- The stage number to be compared.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>Output format</h2>\r
-<div class="sectionbody">\r
-<p>The output format from "git-diff-index", "git-diff-tree" and\r
-"git-diff-files" are very similar.</p>\r
-<p>These commands all compare two sets of things; what is\r
-compared differs:</p>\r
-<dl>\r
-<dt>\r
-git-diff-index <tree-ish>\r
-</dt>\r
-<dd>\r
-<p>\r
- compares the <tree-ish> and the files on the filesystem.\r
-</p>\r
-</dd>\r
-<dt>\r
-git-diff-index --cached <tree-ish>\r
-</dt>\r
-<dd>\r
-<p>\r
- compares the <tree-ish> and the index.\r
-</p>\r
-</dd>\r
-<dt>\r
-git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]\r
-</dt>\r
-<dd>\r
-<p>\r
- compares the trees named by the two arguments.\r
-</p>\r
-</dd>\r
-<dt>\r
-git-diff-files [<pattern>…]\r
-</dt>\r
-<dd>\r
-<p>\r
- compares the index and the files on the filesystem.\r
-</p>\r
-</dd>\r
-</dl>\r
-<p>An output line is formatted this way:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0\r
-copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2\r
-rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3\r
-create :000000 100644 0000000... 1234567... A file4\r
-delete :100644 000000 1234567... 0000000... D file5\r
-unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>\r
-</div></div>\r
-<p>That is, from the left to the right:</p>\r
-<ol>\r
-<li>\r
-<p>\r
-a colon.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-mode for "src"; 000000 if creation or unmerged.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-a space.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-mode for "dst"; 000000 if deletion or unmerged.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-a space.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-sha1 for "src"; 0{40} if creation or unmerged.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-a space.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-a space.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-status, followed by optional "score" number.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-a tab or a NUL when <em>-z</em> option is used.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-path for "src"\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-a tab or a NUL when <em>-z</em> option is used; only exists for C or R.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-path for "dst"; only exists for C or R.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-an LF or a NUL when <em>-z</em> option is used, to terminate the record.\r
-</p>\r
-</li>\r
-</ol>\r
-<p><sha1> is shown as all 0's if a file is new on the filesystem\r
-and it is out of sync with the index.</p>\r
-<p>Example:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>\r
-</div></div>\r
-<p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters\r
-in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,\r
-respectively.</p>\r
-</div>\r
-<h2>Generating patches with -p</h2>\r
-<div class="sectionbody">\r
-<p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run\r
-with a <em>-p</em> option, they do not produce the output described above;\r
-instead they produce a patch file. You can customize the creation\r
-of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS\r
-environment variables.</p>\r
-<p>What the -p option produces is slightly different from the traditional\r
-diff format.</p>\r
-<ol>\r
-<li>\r
-<p>\r
-It is preceded with a "git diff" header, that looks like\r
- this:\r
-</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>diff --git a/file1 b/file2</tt></pre>\r
-</div></div>\r
-<p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is\r
-involved. Especially, even for a creation or a deletion,\r
-<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>\r
-<p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the\r
-name of the source file of the rename/copy and the name of\r
-the file that rename/copy produces, respectively.</p>\r
-</li>\r
-<li>\r
-<p>\r
-It is followed by one or more extended header lines:\r
-</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>old mode <mode>\r
-new mode <mode>\r
-deleted file mode <mode>\r
-new file mode <mode>\r
-copy from <path>\r
-copy to <path>\r
-rename from <path>\r
-rename to <path>\r
-similarity index <number>\r
-dissimilarity index <number>\r
-index <hash>..<hash> <mode></tt></pre>\r
-</div></div>\r
-</li>\r
-<li>\r
-<p>\r
-TAB, LF, double quote and backslash characters in pathnames\r
- are represented as <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt> and <tt>\\</tt>, respectively.\r
- If there is need for such substitution then the whole\r
- pathname is put in double quotes.\r
-</p>\r
-</li>\r
-</ol>\r
-</div>\r
-<h2>combined diff format</h2>\r
-<div class="sectionbody">\r
-<p>git-diff-tree and git-diff-files can take <em>-c</em> or <em>--cc</em> option\r
-to produce <em>combined diff</em>, which looks like this:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>diff --combined describe.c\r
-index fabadb8,cc95eb0..4866510\r
---- a/describe.c\r
-+++ b/describe.c\r
-@@@ -98,20 -98,12 +98,20 @@@\r
- return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\r
- }\r
-\r
-- static void describe(char *arg)\r
- -static void describe(struct commit *cmit, int last_one)\r
-++static void describe(char *arg, int last_one)\r
- {\r
- + unsigned char sha1[20];\r
- + struct commit *cmit;\r
- struct commit_list *list;\r
- static int initialized = 0;\r
- struct commit_name *n;\r
-\r
- + if (get_sha1(arg, sha1) < 0)\r
- + usage(describe_usage);\r
- + cmit = lookup_commit_reference(sha1);\r
- + if (!cmit)\r
- + usage(describe_usage);\r
- +\r
- if (!initialized) {\r
- initialized = 1;\r
- for_each_ref(get_name);</tt></pre>\r
-</div></div>\r
-<ol>\r
-<li>\r
-<p>\r
-It is preceded with a "git diff" header, that looks like\r
- this (when <em>-c</em> option is used):\r
-</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>diff --combined file</tt></pre>\r
-</div></div>\r
-<p>or like this (when <em>--cc</em> option is used):</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>diff --c file</tt></pre>\r
-</div></div>\r
-</li>\r
-<li>\r
-<p>\r
-It is followed by one or more extended header lines\r
- (this example shows a merge with two parents):\r
-</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>index <hash>,<hash>..<hash>\r
-mode <mode>,<mode>..<mode>\r
-new file mode <mode>\r
-deleted file mode <mode>,<mode></tt></pre>\r
-</div></div>\r
-<p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of\r
-the <mode> is different from the rest. Extended headers with\r
-information about detected contents movement (renames and\r
-copying detection) are designed to work with diff of two\r
-<tree-ish> and are not used by combined diff format.</p>\r
-</li>\r
-<li>\r
-<p>\r
-It is followed by two-line from-file/to-file header\r
-</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>--- a/file\r
-+++ b/file</tt></pre>\r
-</div></div>\r
-<p>Similar to two-line header for traditional <em>unified</em> diff\r
-format, <tt>/dev/null</tt> is used to signal created or deleted\r
-files.</p>\r
-</li>\r
-<li>\r
-<p>\r
-Chunk header format is modified to prevent people from\r
- accidentally feeding it to <tt>patch -p1</tt>. Combined diff format\r
- was created for review of merge commit changes, and was not\r
- meant for apply. The change is similar to the change in the\r
- extended <em>index</em> header:\r
-</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>\r
-</div></div>\r
-<p>There are (number of parents + 1) <tt>@</tt> characters in the chunk\r
-header for combined diff format.</p>\r
-</li>\r
-</ol>\r
-<p>Unlike the traditional <em>unified</em> diff format, which shows two\r
-files A and B with a single column that has <tt>-</tt> (minus —\r
-appears in A but removed in B), <tt>+</tt> (plus — missing in A but\r
-added to B), or <tt>" "</tt> (space — unchanged) prefix, this format\r
-compares two or more files file1, file2,… with one file X, and\r
-shows how X differs from each of fileN. One column for each of\r
-fileN is prepended to the output line to note how X's line is\r
-different from it.</p>\r
-<p>A <tt>-</tt> character in the column N means that the line appears in\r
-fileN but it does not appear in the result. A <tt>+</tt> character\r
-in the column N means that the line appears in the last file,\r
-and fileN does not have that line (in other words, the line was\r
-added, from the point of view of that parent).</p>\r
-<p>In the above example output, the function signature was changed\r
-from both files (hence two <tt>-</tt> removals from both file1 and\r
-file2, plus <tt>++</tt> to mean one line that was added does not appear\r
-in either file1 nor file2). Also two other lines are the same\r
-from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>\r
-<p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a\r
-merge commit with the merge result (i.e. file1..fileN are the\r
-parents). When shown by <tt>git diff-files -c</tt>, it compares the\r
-two unresolved merge parents with the working tree file\r
-(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka\r
-"their version").</p>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Junio C Hamano <junkio@cox.net></p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano.</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-Feb-2007 05:52:24 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:46 UTC\r
+Last updated 01-Jun-2008 08:21:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:46 UTC\r
+Last updated 01-Jun-2008 08:21:16 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:17 UTC\r
+Last updated 01-Jun-2008 08:21:20 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Mar-2008 09:40:37 UTC\r
+Last updated 01-Jun-2008 08:21:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-Mar-2008 10:38:32 UTC\r
+Last updated 01-Jun-2008 08:21:22 UTC\r
</div>\r
</div>\r
</body>\r
<dd>\r
<p>\r
The "remote" repository that is the source of a fetch\r
- or pull operation. See the section <a href="#URLS">GIT URLS</a> below.\r
+ or pull operation. This parameter can be either a URL\r
+ (see the section <a href="#URLS">GIT URLS</a> below) or the name\r
+ of a remote (see the section <a href="#REMOTES">REMOTES</a> below).\r
</p>\r
</dd>\r
<dt>\r
<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be\r
rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p>\r
</div>\r
-<h2>REMOTES</h2>\r
+<h2>REMOTES<a id="REMOTES"></a></h2>\r
<div class="sectionbody">\r
-<p>In addition to the above, as a short-hand, the name of a\r
-file in <tt>$GIT_DIR/remotes</tt> directory can be given; the\r
-named file should be in the following format:</p>\r
+<p>The name of one of the following can be used instead\r
+of a URL as <tt><repository></tt> argument:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+a remote in the git configuration file: <tt>$GIT_DIR/config</tt>,\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a file in the <tt>$GIT_DIR/remotes</tt> directory, or\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a file in the <tt>$GIT_DIR/branches</tt> directory.\r
+</p>\r
+</li>\r
+</ul>\r
+<p>All of these also allow you to omit the refspec from the command line\r
+because they each contain a refspec which git will use by default.</p>\r
+<h3>Named remote in configuration file</h3>\r
+<p>You can choose to provide the name of a remote which you had previously\r
+configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a>\r
+or even by a manual edit to the <tt>$GIT_DIR/config</tt> file. The URL of\r
+this remote will be used to access the repository. The refspec\r
+of this remote will be used by default when you do\r
+not provide a refspec on the command line. The entry in the\r
+config file would appear like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> [remote "<name>"]\r
+ url = <url>\r
+ push = <refspec>\r
+ fetch = <refspec></tt></pre>\r
+</div></div>\r
+<h3>Named file in <tt>$GIT_DIR/remotes</tt></h3>\r
+<p>You can choose to provide the name of a\r
+file in <tt>$GIT_DIR/remotes</tt>. The URL\r
+in this file will be used to access the repository. The refspec\r
+in this file will be used as default when you do not\r
+provide a refspec on the command line. This file should have the\r
+following format:</p>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt> URL: one of the above URL format\r
Pull: <refspec>\r
</tt></pre>\r
</div></div>\r
-<p>Then such a short-hand is specified in place of\r
-<repository> without <refspec> parameters on the command\r
-line, <refspec> specified on <tt>Push:</tt> lines or <tt>Pull:</tt>\r
-lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,\r
-respectively. Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
+<p><tt>Push:</tt> lines are used by <tt>git-push</tt> and\r
+<tt>Pull:</tt> lines are used by <tt>git-pull</tt> and <tt>git-fetch</tt>.\r
+Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
be specified for additional branch mappings.</p>\r
-<p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use\r
-of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
+<h3>Named file in <tt>$GIT_DIR/branches</tt></h3>\r
+<p>You can choose to provide the name of a\r
+file in <tt>$GIT_DIR/branches</tt>.\r
+The URL in this file will be used to access the repository.\r
+This file should have the following format:</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt> [remote "<remote>"]\r
- url = <url>\r
- push = <refspec>\r
- fetch = <refspec>\r
-</tt></pre>\r
-</div></div>\r
-<p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
-specified as an older notation short-hand; the named\r
-file should contain a single line, a URL in one of the\r
-above formats, optionally followed by a hash <tt>#</tt> and the\r
-name of remote head (URL fragment notation).\r
-<tt>$GIT_DIR/branches/<remote></tt> file that stores a <url>\r
-without the fragment is equivalent to have this in the\r
-corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt> URL: <url>\r
- Pull: refs/heads/master:<remote>\r
-</tt></pre>\r
+<pre><tt> <url>#<head></tt></pre>\r
</div></div>\r
-<p>while having <tt><url>#<head></tt> is equivalent to</p>\r
+<p><tt><url></tt> is required; <tt>#<head></tt> is optional.\r
+When you do not provide a refspec on the command line,\r
+git will use the following refspec, where <tt><head></tt> defaults to <tt>master</tt>,\r
+and <tt><repository></tt> is the name of this file\r
+you provided in the command line.</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt> URL: <url>\r
- Pull: refs/heads/<head>:<remote></tt></pre>\r
+<pre><tt> refs/heads/<head>:<repository></tt></pre>\r
</div></div>\r
</div>\r
<h2>SEE ALSO</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 28-Feb-2008 00:25:41 UTC\r
+Last updated 01-Jun-2008 08:21:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-May-2008 06:12:01 UTC\r
+Last updated 01-Jun-2008 08:21:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-May-2008 05:45:36 UTC\r
+Last updated 01-Jun-2008 08:21:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:21 UTC\r
+Last updated 01-Jun-2008 08:21:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:33 UTC\r
+Last updated 01-Jun-2008 08:21:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:22 UTC\r
+Last updated 01-Jun-2008 08:21:31 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 30-Apr-2008 08:42:07 UTC\r
+Last updated 01-Jun-2008 08:21:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:33 UTC\r
+Last updated 01-Jun-2008 08:21:33 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:23 UTC\r
+Last updated 01-Jun-2008 08:21:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Mar-2008 01:59:57 UTC\r
+Last updated 01-Jun-2008 08:21:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:34 UTC\r
+Last updated 01-Jun-2008 08:21:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:47 UTC\r
+Last updated 01-Jun-2008 08:21:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-May-2008 05:45:38 UTC\r
+Last updated 01-Jun-2008 08:21:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:25 UTC\r
+Last updated 01-Jun-2008 08:21:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Jan-2008 07:28:35 UTC\r
+Last updated 01-Jun-2008 08:21:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:26 UTC\r
+Last updated 01-Jun-2008 08:21:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Mar-2008 01:59:57 UTC\r
+Last updated 01-Jun-2008 08:21:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:26 UTC\r
+Last updated 01-Jun-2008 08:21:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-Apr-2008 02:23:17 UTC\r
+Last updated 01-Jun-2008 08:21:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-Feb-2008 03:50:08 UTC\r
+Last updated 01-Jun-2008 08:21:37 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-local-fetch(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-local-fetch(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-local-fetch -\r
- Duplicate another git repository on a local system\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<div class="verseblock">\r
-<div class="content"><em>git-local-fetch</em> [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n]\r
- commit-id path</div></div>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>THIS COMMAND IS DEPRECATED.</p>\r
-<p>Duplicates another git repository on a local system.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
--c\r
-</dt>\r
-<dd>\r
-<p>\r
- Get the commit objects.\r
-</p>\r
-</dd>\r
-<dt>\r
--t\r
-</dt>\r
-<dd>\r
-<p>\r
- Get trees associated with the commit objects.\r
-</p>\r
-</dd>\r
-<dt>\r
--a\r
-</dt>\r
-<dd>\r
-<p>\r
- Get all the objects.\r
-</p>\r
-</dd>\r
-<dt>\r
--v\r
-</dt>\r
-<dd>\r
-<p>\r
- Report what is downloaded.\r
-</p>\r
-</dd>\r
-<dt>\r
--s\r
-</dt>\r
-<dd>\r
-<p>\r
- Instead of regular file-to-file copying use symbolic links to the objects\r
- in the remote repository.\r
-</p>\r
-</dd>\r
-<dt>\r
--l\r
-</dt>\r
-<dd>\r
-<p>\r
- Before attempting symlinks (if -s is specified) or file-to-file copying the\r
- remote objects, try to hardlink the remote objects into the local\r
- repository.\r
-</p>\r
-</dd>\r
-<dt>\r
--n\r
-</dt>\r
-<dd>\r
-<p>\r
- Never attempt to file-to-file copy remote objects. Only useful with\r
- -s or -l command-line options.\r
-</p>\r
-</dd>\r
-<dt>\r
--w <filename>\r
-</dt>\r
-<dd>\r
-<p>\r
- Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on\r
- the local end after the transfer is complete.\r
-</p>\r
-</dd>\r
-<dt>\r
---stdin\r
-</dt>\r
-<dd>\r
-<p>\r
- Instead of a commit id on the command line (which is not expected in this\r
- case), <em>git-local-fetch</em> expects lines on stdin in the format\r
-</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt><commit-id>['\t'<filename-as-in--w>]</tt></pre>\r
-</div></div>\r
-</dd>\r
-<dt>\r
---recover\r
-</dt>\r
-<dd>\r
-<p>\r
- Verify that everything reachable from target is fetched. Used after\r
- an earlier fetch is interrupted.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Junio C Hamano <junkio@cox.net></p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.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 25-Aug-2007 03:53:11 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:48 UTC\r
+Last updated 01-Jun-2008 08:21:37 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:28 UTC\r
+Last updated 01-Jun-2008 08:21:37 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:34 UTC\r
+Last updated 01-Jun-2008 08:21:37 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:29 UTC\r
+Last updated 01-Jun-2008 08:21:38 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:30 UTC\r
+Last updated 01-Jun-2008 08:21:38 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:30 UTC\r
+Last updated 01-Jun-2008 08:21:38 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:30 UTC\r
+Last updated 01-Jun-2008 08:21:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:31 UTC\r
+Last updated 01-Jun-2008 08:21:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:31 UTC\r
+Last updated 01-Jun-2008 08:21:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-Feb-2008 22:56:35 UTC\r
+Last updated 01-Jun-2008 08:21:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:32 UTC\r
+Last updated 01-Jun-2008 08:21:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:32 UTC\r
+Last updated 01-Jun-2008 08:21:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-May-2008 22:24:42 UTC\r
+Last updated 01-Jun-2008 08:21:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-Mar-2008 10:38:33 UTC\r
+Last updated 01-Jun-2008 08:21:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:33 UTC\r
+Last updated 01-Jun-2008 08:21:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:34 UTC\r
+Last updated 01-Jun-2008 08:21:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:34 UTC\r
+Last updated 01-Jun-2008 08:21:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:34 UTC\r
+Last updated 01-Jun-2008 08:21:41 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-p4import(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-p4import(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-p4import -\r
- Import a Perforce repository into git\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<div class="verseblock">\r
-<div class="content"><tt>git-p4import</tt> [-q|-v] [--notags] [--authors <file>] [-t <timezone>]\r
- <//p4repo/path> <branch>\r
-<tt>git-p4import</tt> --stitch <//p4repo/path>\r
-<tt>git-p4import</tt></div></div>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>Import a Perforce repository into an existing git repository. When\r
-a <//p4repo/path> and <branch> are specified a new branch with the\r
-given name will be created and the initial import will begin.</p>\r
-<p>Once the initial import is complete you can do an incremental import\r
-of new commits from the Perforce repository. You do this by checking\r
-out the appropriate git branch and then running <tt>git-p4import</tt> without\r
-any options.</p>\r
-<p>The standard p4 client is used to communicate with the Perforce\r
-repository; it must be configured correctly in order for <tt>git-p4import</tt>\r
-to operate (see below).</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
--q\r
-</dt>\r
-<dd>\r
-<p>\r
- Do not display any progress information.\r
-</p>\r
-</dd>\r
-<dt>\r
--v\r
-</dt>\r
-<dd>\r
-<p>\r
- Give extra progress information.\r
-</p>\r
-</dd>\r
-<dt>\r
---authors\r
-</dt>\r
-<dd>\r
-<p>\r
- Specify an authors file containing a mapping of Perforce user\r
- ids to full names and email addresses (see Notes below).\r
-</p>\r
-</dd>\r
-<dt>\r
---notags\r
-</dt>\r
-<dd>\r
-<p>\r
- Do not create a tag for each imported commit.\r
-</p>\r
-</dd>\r
-<dt>\r
---stitch\r
-</dt>\r
-<dd>\r
-<p>\r
- Import the contents of the given perforce branch into the\r
- currently checked out git branch.\r
-</p>\r
-</dd>\r
-<dt>\r
---log\r
-</dt>\r
-<dd>\r
-<p>\r
- Store debugging information in the specified file.\r
-</p>\r
-</dd>\r
-<dt>\r
--t\r
-</dt>\r
-<dd>\r
-<p>\r
- Specify that the remote repository is in the specified timezone.\r
- Timezone must be in the format "US/Pacific" or "Europe/London"\r
- etc. You only need to specify this once, it will be saved in\r
- the git config file for the repository.\r
-</p>\r
-</dd>\r
-<dt>\r
-<//p4repo/path>\r
-</dt>\r
-<dd>\r
-<p>\r
- The Perforce path that will be imported into the specified branch.\r
-</p>\r
-</dd>\r
-<dt>\r
-<branch>\r
-</dt>\r
-<dd>\r
-<p>\r
- The new branch that will be created to hold the Perforce imports.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>P4 Client</h2>\r
-<div class="sectionbody">\r
-<p>You must make the <tt>p4</tt> client command available in your $PATH and\r
-configure it to communicate with the target Perforce repository.\r
-Typically this means you must set the "$P4PORT" and "$P4CLIENT"\r
-environment variables.</p>\r
-<p>You must also configure a <tt>p4</tt> client "view" which maps the Perforce\r
-branch into the top level of your git repository, for example:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>Client: myhost\r
-\r
-Root: /home/sean/import\r
-\r
-Options: noallwrite clobber nocompress unlocked modtime rmdir\r
-\r
-View:\r
- //public/jam/... //myhost/jam/...</tt></pre>\r
-</div></div>\r
-<p>With the above <tt>p4</tt> client setup, you could import the "jam"\r
-perforce branch into a branch named "jammy", like so:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ mkdir -p /home/sean/import/jam\r
-$ cd /home/sean/import/jam\r
-$ git init\r
-$ git p4import //public/jam jammy</tt></pre>\r
-</div></div>\r
-</div>\r
-<h2>Multiple Branches</h2>\r
-<div class="sectionbody">\r
-<p>Note that by creating multiple "views" you can use <tt>git-p4import</tt>\r
-to import additional branches into the same git repository.\r
-However, the <tt>p4</tt> client has a limitation in that it silently\r
-ignores all but the last "view" that maps into the same local\r
-directory. So the following will <strong>not</strong> work:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>View:\r
- //public/jam/... //myhost/jam/...\r
- //public/other/... //myhost/jam/...\r
- //public/guest/... //myhost/jam/...</tt></pre>\r
-</div></div>\r
-<p>If you want more than one Perforce branch to be imported into the\r
-same directory you must employ a workaround. A simple option is\r
-to adjust your <tt>p4</tt> client before each import to only include a\r
-single view.</p>\r
-<p>Another option is to create multiple symlinks locally which all\r
-point to the same directory in your git repository and then use\r
-one per "view" instead of listing the actual directory.</p>\r
-</div>\r
-<h2>Tags</h2>\r
-<div class="sectionbody">\r
-<p>A git tag of the form p4/xx is created for every change imported from\r
-the Perforce repository where xx is the Perforce changeset number.\r
-Therefore after the import you can use git to access any commit by its\r
-Perforce number, e.g. git show p4/327.</p>\r
-<p>The tag associated with the HEAD commit is also how <tt>git-p4import</tt>\r
-determines if there are new changes to incrementally import from the\r
-Perforce repository.</p>\r
-<p>If you import from a repository with many thousands of changes\r
-you will have an equal number of p4/xxxx git tags. Git tags can\r
-be expensive in terms of disk space and repository operations.\r
-If you don't need to perform further incremental imports, you\r
-may delete the tags.</p>\r
-</div>\r
-<h2>Notes</h2>\r
-<div class="sectionbody">\r
-<p>You can interrupt the import (e.g. ctrl-c) at any time and restart it\r
-without worry.</p>\r
-<p>Author information is automatically determined by querying the\r
-Perforce "users" table using the id associated with each change.\r
-However, if you want to manually supply these mappings you can do\r
-so with the "--authors" option. It accepts a file containing a list\r
-of mappings with each line containing one mapping in the format:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt> perforce_id = Full Name <email@address.com></tt></pre>\r
-</div></div>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Sean Estabrooks <seanlkml@sympatico.ca></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 16-Jun-2007 09:49:14 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:35 UTC\r
+Last updated 01-Jun-2008 08:21:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:35 UTC\r
+Last updated 01-Jun-2008 08:21:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:35 UTC\r
+Last updated 01-Jun-2008 08:21:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:35 UTC\r
+Last updated 01-Jun-2008 08:21:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:36 UTC\r
+Last updated 01-Jun-2008 08:21:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:36 UTC\r
+Last updated 01-Jun-2008 08:21:42 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-pickaxe(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-pickaxe(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-pickaxe -\r
- Show what revision and author last modified each line of a file\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<div class="verseblock">\r
-<div class="content"><em>git-pickaxe</em> [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>]\r
- [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file></div></div>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>Annotates each line in the given file with information from the revision which\r
-last modified the line. Optionally, start annotating from the given revision.</p>\r
-<p>Also it can limit the range of lines annotated.</p>\r
-<p>This report doesn't tell you anything about lines which have been deleted or\r
-replaced; you need to use a tool such as <a href="git-diff.html">git-diff(1)</a> or the "pickaxe"\r
-interface briefly mentioned in the following paragraph.</p>\r
-<p>Apart from supporting file annotation, git also supports searching the\r
-development history for when a code snippet occured in a change. This makes it\r
-possible to track when a code snippet was added to a file, moved or copied\r
-between files, and eventually deleted or replaced. It works by searching for\r
-a text string in the diff. A small example:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git log --pretty=oneline -S'blame_usage'\r
-5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <ancestry-file>\r
-ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre>\r
-</div></div>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
--c, --compatibility\r
-</dt>\r
-<dd>\r
-<p>\r
- Use the same output mode as <a href="git-annotate.html">git-annotate(1)</a> (Default: off).\r
-</p>\r
-</dd>\r
-<dt>\r
--L n,m\r
-</dt>\r
-<dd>\r
-<p>\r
- Annotate only the specified line range (lines count from 1).\r
-</p>\r
-</dd>\r
-<dt>\r
--l, --long\r
-</dt>\r
-<dd>\r
-<p>\r
- Show long rev (Default: off).\r
-</p>\r
-</dd>\r
-<dt>\r
--t, --time\r
-</dt>\r
-<dd>\r
-<p>\r
- Show raw timestamp (Default: off).\r
-</p>\r
-</dd>\r
-<dt>\r
--S, --rev-file <revs-file>\r
-</dt>\r
-<dd>\r
-<p>\r
- Use revs from revs-file instead of calling <a href="git-rev-list.html">git-rev-list(1)</a>.\r
-</p>\r
-</dd>\r
-<dt>\r
--f, --show-name\r
-</dt>\r
-<dd>\r
-<p>\r
- Show filename in the original commit. By default\r
- filename is shown if there is any line that came from a\r
- file with different name, due to rename detection.\r
-</p>\r
-</dd>\r
-<dt>\r
--n, --show-number\r
-</dt>\r
-<dd>\r
-<p>\r
- Show line number in the original commit (Default: off).\r
-</p>\r
-</dd>\r
-<dt>\r
--p, --porcelain\r
-</dt>\r
-<dd>\r
-<p>\r
- Show in a format designed for machine consumption.\r
-</p>\r
-</dd>\r
-<dt>\r
--M\r
-</dt>\r
-<dd>\r
-<p>\r
- Detect moving lines in the file as well. When a commit\r
- moves a block of lines in a file (e.g. the original file\r
- has A and then B, and the commit changes it to B and\r
- then A), traditional <em>blame</em> algorithm typically blames\r
- the lines that were moved up (i.e. B) to the parent and\r
- assigns blame to the lines that were moved down (i.e. A)\r
- to the child commit. With this option, both groups of\r
- lines are blamed on the parent.\r
-</p>\r
-</dd>\r
-<dt>\r
--C\r
-</dt>\r
-<dd>\r
-<p>\r
- In addition to <tt>-M</tt>, detect lines copied from other\r
- files that were modified in the same commit. This is\r
- useful when you reorganize your program and move code\r
- around across files. When this option is given twice,\r
- the command looks for copies from all other files in the\r
- parent for the commit that creates the file in addition.\r
-</p>\r
-</dd>\r
-<dt>\r
--h, --help\r
-</dt>\r
-<dd>\r
-<p>\r
- Show help message.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>THE PORCELAIN FORMAT</h2>\r
-<div class="sectionbody">\r
-<p>In this format, each line is output after a header; the\r
-header at the minumum has the first line which has:</p>\r
-<ul>\r
-<li>\r
-<p>\r
-40-byte SHA-1 of the commit the line is attributed to;\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-the line number of the line in the original file;\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-the line number of the line in the final file;\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-on a line that starts a group of line from a different\r
- commit than the previous one, the number of lines in this\r
- group. On subsequent lines this field is absent.\r
-</p>\r
-</li>\r
-</ul>\r
-<p>This header line is followed by the following information\r
-at least once for each commit:</p>\r
-<ul>\r
-<li>\r
-<p>\r
-author name ("author"), email ("author-mail"), time\r
- ("author-time"), and timezone ("author-tz"); similarly\r
- for committer.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-filename in the commit the line is attributed to.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-the first line of the commit log message ("summary").\r
-</p>\r
-</li>\r
-</ul>\r
-<p>The contents of the actual line is output after the above\r
-header, prefixed by a TAB. This is to allow adding more\r
-header elements later.</p>\r
-</div>\r
-<h2>SPECIFIYING RANGES</h2>\r
-<div class="sectionbody">\r
-<p>Unlike <tt>git-blame</tt> and <tt>git-annotate</tt> in older git, the extent\r
-of annotation can be limited to both line ranges and revision\r
-ranges. When you are interested in finding the origin for\r
-ll. 40-60 for file <tt>foo</tt>, you can use <tt>-L</tt> option like this:</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>git pickaxe -L 40,60 foo</tt></pre>\r
-</div></div>\r
-<p>When you are not interested in changes older than the version\r
-v2.6.18, or changes older than 3 weeks, you can use revision\r
-range specifiers similar to <tt>git-rev-list</tt>:</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>git pickaxe v2.6.18.. -- foo\r
-git pickaxe --since=3.weeks -- foo</tt></pre>\r
-</div></div>\r
-<p>When revision range specifiers are used to limit the annotation,\r
-lines that have not changed since the range boundary (either the\r
-commit v2.6.18 or the most recent commit that is more than 3\r
-weeks old in the above example) are blamed for that range\r
-boundary commit.</p>\r
-<p>A particularly useful way is to see if an added file have lines\r
-created by copy-and-paste from existing files. Sometimes this\r
-indicates that the developer was being sloppy and did not\r
-refactor the code properly. You can first find the commit that\r
-introduced the file with:</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>git log --diff-filter=A --pretty=short -- foo</tt></pre>\r
-</div></div>\r
-<p>and then annotate the change between the commit and its\r
-parents, using <tt>commit^!</tt> notation:</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>git pickaxe -C -C -f $commit^! -- foo</tt></pre>\r
-</div></div>\r
-</div>\r
-<h2>SEE ALSO</h2>\r
-<div class="sectionbody">\r
-<p><a href="git-blame.html">git-blame(1)</a></p>\r
-</div>\r
-<h2>AUTHOR</h2>\r
-<div class="sectionbody">\r
-<p>Written by Junio C Hamano <junkio@cox.net></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 08-Nov-2006 01:33:29 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:35 UTC\r
+Last updated 01-Jun-2008 08:21:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:36 UTC\r
+Last updated 01-Jun-2008 08:21:42 UTC\r
</div>\r
</div>\r
</body>\r
<dd>\r
<p>\r
The "remote" repository that is the source of a fetch\r
- or pull operation. See the section <a href="#URLS">GIT URLS</a> below.\r
+ or pull operation. This parameter can be either a URL\r
+ (see the section <a href="#URLS">GIT URLS</a> below) or the name\r
+ of a remote (see the section <a href="#REMOTES">REMOTES</a> below).\r
</p>\r
</dd>\r
<dt>\r
<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be\r
rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p>\r
</div>\r
-<h2>REMOTES</h2>\r
+<h2>REMOTES<a id="REMOTES"></a></h2>\r
<div class="sectionbody">\r
-<p>In addition to the above, as a short-hand, the name of a\r
-file in <tt>$GIT_DIR/remotes</tt> directory can be given; the\r
-named file should be in the following format:</p>\r
+<p>The name of one of the following can be used instead\r
+of a URL as <tt><repository></tt> argument:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+a remote in the git configuration file: <tt>$GIT_DIR/config</tt>,\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a file in the <tt>$GIT_DIR/remotes</tt> directory, or\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a file in the <tt>$GIT_DIR/branches</tt> directory.\r
+</p>\r
+</li>\r
+</ul>\r
+<p>All of these also allow you to omit the refspec from the command line\r
+because they each contain a refspec which git will use by default.</p>\r
+<h3>Named remote in configuration file</h3>\r
+<p>You can choose to provide the name of a remote which you had previously\r
+configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a>\r
+or even by a manual edit to the <tt>$GIT_DIR/config</tt> file. The URL of\r
+this remote will be used to access the repository. The refspec\r
+of this remote will be used by default when you do\r
+not provide a refspec on the command line. The entry in the\r
+config file would appear like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> [remote "<name>"]\r
+ url = <url>\r
+ push = <refspec>\r
+ fetch = <refspec></tt></pre>\r
+</div></div>\r
+<h3>Named file in <tt>$GIT_DIR/remotes</tt></h3>\r
+<p>You can choose to provide the name of a\r
+file in <tt>$GIT_DIR/remotes</tt>. The URL\r
+in this file will be used to access the repository. The refspec\r
+in this file will be used as default when you do not\r
+provide a refspec on the command line. This file should have the\r
+following format:</p>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt> URL: one of the above URL format\r
Pull: <refspec>\r
</tt></pre>\r
</div></div>\r
-<p>Then such a short-hand is specified in place of\r
-<repository> without <refspec> parameters on the command\r
-line, <refspec> specified on <tt>Push:</tt> lines or <tt>Pull:</tt>\r
-lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,\r
-respectively. Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
+<p><tt>Push:</tt> lines are used by <tt>git-push</tt> and\r
+<tt>Pull:</tt> lines are used by <tt>git-pull</tt> and <tt>git-fetch</tt>.\r
+Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
be specified for additional branch mappings.</p>\r
-<p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use\r
-of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
+<h3>Named file in <tt>$GIT_DIR/branches</tt></h3>\r
+<p>You can choose to provide the name of a\r
+file in <tt>$GIT_DIR/branches</tt>.\r
+The URL in this file will be used to access the repository.\r
+This file should have the following format:</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt> [remote "<remote>"]\r
- url = <url>\r
- push = <refspec>\r
- fetch = <refspec>\r
-</tt></pre>\r
-</div></div>\r
-<p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
-specified as an older notation short-hand; the named\r
-file should contain a single line, a URL in one of the\r
-above formats, optionally followed by a hash <tt>#</tt> and the\r
-name of remote head (URL fragment notation).\r
-<tt>$GIT_DIR/branches/<remote></tt> file that stores a <url>\r
-without the fragment is equivalent to have this in the\r
-corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt> URL: <url>\r
- Pull: refs/heads/master:<remote>\r
-</tt></pre>\r
+<pre><tt> <url>#<head></tt></pre>\r
</div></div>\r
-<p>while having <tt><url>#<head></tt> is equivalent to</p>\r
+<p><tt><url></tt> is required; <tt>#<head></tt> is optional.\r
+When you do not provide a refspec on the command line,\r
+git will use the following refspec, where <tt><head></tt> defaults to <tt>master</tt>,\r
+and <tt><repository></tt> is the name of this file\r
+you provided in the command line.</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt> URL: <url>\r
- Pull: refs/heads/<head>:<remote></tt></pre>\r
+<pre><tt> refs/heads/<head>:<repository></tt></pre>\r
</div></div>\r
</div>\r
<h2>MERGE STRATEGIES</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-May-2008 05:45:38 UTC\r
+Last updated 01-Jun-2008 08:21:42 UTC\r
</div>\r
</div>\r
</body>\r
<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be\r
rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p>\r
</div>\r
-<h2>REMOTES</h2>\r
+<h2>REMOTES<a id="REMOTES"></a></h2>\r
<div class="sectionbody">\r
-<p>In addition to the above, as a short-hand, the name of a\r
-file in <tt>$GIT_DIR/remotes</tt> directory can be given; the\r
-named file should be in the following format:</p>\r
+<p>The name of one of the following can be used instead\r
+of a URL as <tt><repository></tt> argument:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+a remote in the git configuration file: <tt>$GIT_DIR/config</tt>,\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a file in the <tt>$GIT_DIR/remotes</tt> directory, or\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a file in the <tt>$GIT_DIR/branches</tt> directory.\r
+</p>\r
+</li>\r
+</ul>\r
+<p>All of these also allow you to omit the refspec from the command line\r
+because they each contain a refspec which git will use by default.</p>\r
+<h3>Named remote in configuration file</h3>\r
+<p>You can choose to provide the name of a remote which you had previously\r
+configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a>\r
+or even by a manual edit to the <tt>$GIT_DIR/config</tt> file. The URL of\r
+this remote will be used to access the repository. The refspec\r
+of this remote will be used by default when you do\r
+not provide a refspec on the command line. The entry in the\r
+config file would appear like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> [remote "<name>"]\r
+ url = <url>\r
+ push = <refspec>\r
+ fetch = <refspec></tt></pre>\r
+</div></div>\r
+<h3>Named file in <tt>$GIT_DIR/remotes</tt></h3>\r
+<p>You can choose to provide the name of a\r
+file in <tt>$GIT_DIR/remotes</tt>. The URL\r
+in this file will be used to access the repository. The refspec\r
+in this file will be used as default when you do not\r
+provide a refspec on the command line. This file should have the\r
+following format:</p>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt> URL: one of the above URL format\r
Pull: <refspec>\r
</tt></pre>\r
</div></div>\r
-<p>Then such a short-hand is specified in place of\r
-<repository> without <refspec> parameters on the command\r
-line, <refspec> specified on <tt>Push:</tt> lines or <tt>Pull:</tt>\r
-lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,\r
-respectively. Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
+<p><tt>Push:</tt> lines are used by <tt>git-push</tt> and\r
+<tt>Pull:</tt> lines are used by <tt>git-pull</tt> and <tt>git-fetch</tt>.\r
+Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
be specified for additional branch mappings.</p>\r
-<p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use\r
-of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
+<h3>Named file in <tt>$GIT_DIR/branches</tt></h3>\r
+<p>You can choose to provide the name of a\r
+file in <tt>$GIT_DIR/branches</tt>.\r
+The URL in this file will be used to access the repository.\r
+This file should have the following format:</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt> [remote "<remote>"]\r
- url = <url>\r
- push = <refspec>\r
- fetch = <refspec>\r
-</tt></pre>\r
-</div></div>\r
-<p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
-specified as an older notation short-hand; the named\r
-file should contain a single line, a URL in one of the\r
-above formats, optionally followed by a hash <tt>#</tt> and the\r
-name of remote head (URL fragment notation).\r
-<tt>$GIT_DIR/branches/<remote></tt> file that stores a <url>\r
-without the fragment is equivalent to have this in the\r
-corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt> URL: <url>\r
- Pull: refs/heads/master:<remote>\r
-</tt></pre>\r
+<pre><tt> <url>#<head></tt></pre>\r
</div></div>\r
-<p>while having <tt><url>#<head></tt> is equivalent to</p>\r
+<p><tt><url></tt> is required; <tt>#<head></tt> is optional.\r
+When you do not provide a refspec on the command line,\r
+git will use the following refspec, where <tt><head></tt> defaults to <tt>master</tt>,\r
+and <tt><repository></tt> is the name of this file\r
+you provided in the command line.</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt> URL: <url>\r
- Pull: refs/heads/<head>:<remote></tt></pre>\r
+<pre><tt> refs/heads/<head>:<repository></tt></pre>\r
</div></div>\r
</div>\r
<h2>OUTPUT</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-May-2008 01:12:07 UTC\r
+Last updated 01-Jun-2008 08:21:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:38 UTC\r
+Last updated 01-Jun-2008 08:21:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:36 UTC\r
+Last updated 01-Jun-2008 08:21:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Mar-2008 09:24:07 UTC\r
+Last updated 01-Jun-2008 08:21:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:39 UTC\r
+Last updated 01-Jun-2008 08:21:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-Mar-2008 09:29:59 UTC\r
+Last updated 01-Jun-2008 08:21:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 12-Jan-2008 06:43:56 UTC\r
+Last updated 01-Jun-2008 08:21:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:37 UTC\r
+Last updated 01-Jun-2008 08:21:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:37 UTC\r
+Last updated 01-Jun-2008 08:21:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:42 UTC\r
+Last updated 01-Jun-2008 08:21:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 12-Apr-2008 08:22:50 UTC\r
+Last updated 01-Jun-2008 08:21:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Jan-2008 08:30:41 UTC\r
+Last updated 01-Jun-2008 08:21:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-Feb-2008 03:50:08 UTC\r
+Last updated 01-Jun-2008 08:21:45 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-resolve(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-resolve(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-resolve -\r
- Merge two commits\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-resolve</em> <current> <merged> <message></p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>DEPRECATED and will be removed in 1.5.1. Use <tt>git-merge</tt> instead.</p>\r
-<p>Given two commits and a merge message, merge the <merged> commit\r
-into <current> commit, with the commit log message <message>.</p>\r
-<p>When <current> is a descendant of <merged>, or <current> is an\r
-ancestor of <merged>, no new commit is created and the <message>\r
-is ignored. The former is informally called "already up to\r
-date", and the latter is often called "fast forward".</p>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org> and\r
-Dan Holmsand <holmsand@gmail.com>.</p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.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-Feb-2007 05:52:26 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-May-2008 01:12:07 UTC\r
+Last updated 01-Jun-2008 08:21:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-May-2008 07:44:12 UTC\r
+Last updated 01-Jun-2008 08:21:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-May-2008 05:45:39 UTC\r
+Last updated 01-Jun-2008 08:21:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:37 UTC\r
+Last updated 01-Jun-2008 08:21:47 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-runstatus(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-runstatus(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-runstatus -\r
- A helper for git-status and git-commit\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-runstatus</em> [--color|--nocolor] [--amend] [--verbose] [--untracked]</p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>Examines paths in the working tree that has changes unrecorded\r
-to the index file, and changes between the index file and the\r
-current HEAD commit. The former paths are what you _could_\r
-commit by running <em>git add</em> (or <em>git rm</em> if you are deleting) before running <em>git\r
-commit</em>, and the latter paths are what you _would_ commit by\r
-running <em>git commit</em>.</p>\r
-<p>If there is no path that is different between the index file and\r
-the current HEAD commit, the command exits with non-zero status.</p>\r
-<p>Note that this is _not_ the user level command you would want to\r
-run from the command line. Use <em>git-status</em> instead.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
---color\r
-</dt>\r
-<dd>\r
-<p>\r
- Show colored status, highlighting modified file names.\r
-</p>\r
-</dd>\r
-<dt>\r
---nocolor\r
-</dt>\r
-<dd>\r
-<p>\r
- Turn off coloring.\r
-</p>\r
-</dd>\r
-<dt>\r
---amend\r
-</dt>\r
-<dd>\r
-<p>\r
- Show status based on HEAD^1, not HEAD, i.e. show what\r
- <em>git-commit --amend</em> would do.\r
-</p>\r
-</dd>\r
-<dt>\r
---verbose\r
-</dt>\r
-<dd>\r
-<p>\r
- Show unified diff of all file changes.\r
-</p>\r
-</dd>\r
-<dt>\r
---untracked\r
-</dt>\r
-<dd>\r
-<p>\r
- Show files in untracked directories, too. Without this\r
- option only its name and a trailing slash are displayed\r
- for each untracked directory.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>OUTPUT</h2>\r
-<div class="sectionbody">\r
-<p>The output from this command is designed to be used as a commit\r
-template comments, and all the output lines are prefixed with <em>#</em>.</p>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Originally written by Linus Torvalds <torvalds@osdl.org> as part\r
-of git-commit, and later rewritten in C by Jeff King.</p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.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 14-Nov-2007 12:11:47 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-Mar-2008 08:45:34 UTC\r
+Last updated 01-Jun-2008 08:21:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:47 UTC\r
+Last updated 01-Jun-2008 08:21:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:50 UTC\r
+Last updated 01-Jun-2008 08:21:49 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:47 UTC\r
+Last updated 01-Jun-2008 08:21:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-Apr-2008 05:32:58 UTC\r
+Last updated 01-Jun-2008 08:21:48 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:47 UTC\r
+Last updated 01-Jun-2008 08:21:48 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:48 UTC\r
+Last updated 01-Jun-2008 08:21:48 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:49 UTC\r
+Last updated 01-Jun-2008 08:21:48 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-May-2008 01:12:08 UTC\r
+Last updated 01-Jun-2008 08:21:48 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-ssh-fetch(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-ssh-fetch(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-ssh-fetch -\r
- Fetch from a remote repository over ssh connection\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-ssh-fetch</em> [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url</p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>THIS COMMAND IS DEPRECATED.</p>\r
-<p>Pulls from a remote repository over ssh connection, invoking\r
-git-ssh-upload on the other end. It functions identically to\r
-git-ssh-upload, aside from which end you run it on.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
-commit-id\r
-</dt>\r
-<dd>\r
-<p>\r
- Either the hash or the filename under [URL]/refs/ to\r
- pull.\r
-</p>\r
-</dd>\r
-<dt>\r
--c\r
-</dt>\r
-<dd>\r
-<p>\r
- Get the commit objects.\r
-</p>\r
-</dd>\r
-<dt>\r
--t\r
-</dt>\r
-<dd>\r
-<p>\r
- Get trees associated with the commit objects.\r
-</p>\r
-</dd>\r
-<dt>\r
--a\r
-</dt>\r
-<dd>\r
-<p>\r
- Get all the objects.\r
-</p>\r
-</dd>\r
-<dt>\r
--v\r
-</dt>\r
-<dd>\r
-<p>\r
- Report what is downloaded.\r
-</p>\r
-</dd>\r
-<dt>\r
--w\r
-</dt>\r
-<dd>\r
-<p>\r
- Writes the commit-id into the filename under $GIT_DIR/refs/ on\r
- the local end after the transfer is complete.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Daniel Barkalow <barkalow@iabervon.org></p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.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 19-Jul-2007 02:09:55 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
+++ /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-ssh-upload(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-ssh-upload(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-ssh-upload -\r
- Push to a remote repository over ssh connection\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-ssh-upload</em> [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url</p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>THIS COMMAND IS DEPRECATED.</p>\r
-<p>Pushes from a remote repository over ssh connection, invoking\r
-git-ssh-fetch on the other end. It functions identically to\r
-git-ssh-fetch, aside from which end you run it on.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
-commit-id\r
-</dt>\r
-<dd>\r
-<p>\r
- Id of commit to push.\r
-</p>\r
-</dd>\r
-<dt>\r
--c\r
-</dt>\r
-<dd>\r
-<p>\r
- Get the commit objects.\r
-</p>\r
-</dd>\r
-<dt>\r
--t\r
-</dt>\r
-<dd>\r
-<p>\r
- Get tree associated with the requested commit object.\r
-</p>\r
-</dd>\r
-<dt>\r
--a\r
-</dt>\r
-<dd>\r
-<p>\r
- Get all the objects.\r
-</p>\r
-</dd>\r
-<dt>\r
--v\r
-</dt>\r
-<dd>\r
-<p>\r
- Report what is uploaded.\r
-</p>\r
-</dd>\r
-<dt>\r
--w\r
-</dt>\r
-<dd>\r
-<p>\r
- Writes the commit-id into the filename under [URL]/refs/ on\r
- the remote end after the transfer is complete.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Daniel Barkalow <barkalow@iabervon.org></p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by Daniel Barkalow</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 19-Jul-2007 02:09:55 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-Mar-2008 09:30:02 UTC\r
+Last updated 01-Jun-2008 08:21:49 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:38 UTC\r
+Last updated 01-Jun-2008 08:21:49 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:51 UTC\r
+Last updated 01-Jun-2008 08:21:49 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-May-2008 06:12:01 UTC\r
+Last updated 01-Jun-2008 08:21:49 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:49 UTC\r
+Last updated 01-Jun-2008 08:21:50 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-svnimport(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-svnimport(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-svnimport -\r
- Import a SVN repository into git\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<div class="verseblock">\r
-<div class="content"><em>git-svnimport</em> [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ]\r
- [ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]\r
- [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]\r
- [ -s start_chg ] [ -m ] [ -r ] [ -M regex ]\r
- [ -I <ignorefile_name> ] [ -A <author_file> ]\r
- [ -R <repack_each_revs>] [ -P <path_from_trunk> ]\r
- <SVN_repository_URL> [ <path> ]</div></div>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>Imports a SVN repository into git. It will either create a new\r
-repository, or incrementally import into an existing one.</p>\r
-<p>SVN access is done by the SVN::Perl module.</p>\r
-<p>git-svnimport assumes that SVN repositories are organized into one\r
-"trunk" directory where the main development happens, "branches/FOO"\r
-directories for branches, and "/tags/FOO" directories for tags.\r
-Other subdirectories are ignored.</p>\r
-<p>git-svnimport creates a file ".git/svn2git", which is required for\r
-incremental SVN imports.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
--C <target-dir>\r
-</dt>\r
-<dd>\r
-<p>\r
- The GIT repository to import to. If the directory doesn't\r
- exist, it will be created. Default is the current directory.\r
-</p>\r
-</dd>\r
-<dt>\r
--s <start_rev>\r
-</dt>\r
-<dd>\r
-<p>\r
- Start importing at this SVN change number. The default is 1.\r
-</p>\r
-<p>When importing incrementally, you might need to edit the .git/svn2git file.</p>\r
-</dd>\r
-<dt>\r
--i\r
-</dt>\r
-<dd>\r
-<p>\r
- Import-only: don't perform a checkout after importing. This option\r
- ensures the working directory and index remain untouched and will\r
- not create them if they do not exist.\r
-</p>\r
-</dd>\r
-<dt>\r
--T <trunk_subdir>\r
-</dt>\r
-<dd>\r
-<p>\r
- Name the SVN trunk. Default "trunk".\r
-</p>\r
-</dd>\r
-<dt>\r
--t <tag_subdir>\r
-</dt>\r
-<dd>\r
-<p>\r
- Name the SVN subdirectory for tags. Default "tags".\r
-</p>\r
-</dd>\r
-<dt>\r
--b <branch_subdir>\r
-</dt>\r
-<dd>\r
-<p>\r
- Name the SVN subdirectory for branches. Default "branches".\r
-</p>\r
-</dd>\r
-<dt>\r
--o <branch-for-HEAD>\r
-</dt>\r
-<dd>\r
-<p>\r
- The <em>trunk</em> branch from SVN is imported to the <em>origin</em> branch within\r
- the git repository. Use this option if you want to import into a\r
- different branch.\r
-</p>\r
-</dd>\r
-<dt>\r
--r\r
-</dt>\r
-<dd>\r
-<p>\r
- Prepend <em>rX: </em> to commit messages, where X is the imported\r
- subversion revision.\r
-</p>\r
-</dd>\r
-<dt>\r
--u\r
-</dt>\r
-<dd>\r
-<p>\r
- Replace underscores in tag names with periods.\r
-</p>\r
-</dd>\r
-<dt>\r
--I <ignorefile_name>\r
-</dt>\r
-<dd>\r
-<p>\r
- Import the svn:ignore directory property to files with this\r
- name in each directory. (The Subversion and GIT ignore\r
- syntaxes are similar enough that using the Subversion patterns\r
- directly with "-I .gitignore" will almost always just work.)\r
-</p>\r
-</dd>\r
-<dt>\r
--A <author_file>\r
-</dt>\r
-<dd>\r
-<p>\r
- Read a file with lines on the form\r
-</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt> username = User's Full Name <email@addr.es>\r
-</tt></pre>\r
-</div></div>\r
-<p>and use "User's Full Name <email@addr.es>" as the GIT\r
-author and committer for Subversion commits made by\r
-"username". If encountering a commit made by a user not in the\r
-list, abort.</p>\r
-<p>For convenience, this data is saved to $GIT_DIR/svn-authors\r
-each time the -A option is provided, and read from that same\r
-file each time git-svnimport is run with an existing GIT\r
-repository without -A.</p>\r
-</dd>\r
-<dt>\r
--m\r
-</dt>\r
-<dd>\r
-<p>\r
- Attempt to detect merges based on the commit message. This option\r
- will enable default regexes that try to capture the name source\r
- branch name from the commit message.\r
-</p>\r
-</dd>\r
-<dt>\r
--M <regex>\r
-</dt>\r
-<dd>\r
-<p>\r
- Attempt to detect merges based on the commit message with a custom\r
- regex. It can be used with -m to also see the default regexes.\r
- You must escape forward slashes.\r
-</p>\r
-</dd>\r
-<dt>\r
--l <max_rev>\r
-</dt>\r
-<dd>\r
-<p>\r
- Specify a maximum revision number to pull.\r
-</p>\r
-<p>Formerly, this option controlled how many revisions to pull,\r
-due to SVN memory leaks. (These have been worked around.)</p>\r
-</dd>\r
-<dt>\r
--R <repack_each_revs>\r
-</dt>\r
-<dd>\r
-<p>\r
- Specify how often git repository should be repacked.\r
-</p>\r
-<p>The default value is 1000. git-svnimport will do import in chunks of 1000\r
-revisions, after each chunk git repository will be repacked. To disable\r
-this behavior specify some big value here which is mote than number of\r
-revisions to import.</p>\r
-</dd>\r
-<dt>\r
--P <path_from_trunk>\r
-</dt>\r
-<dd>\r
-<p>\r
- Partial import of the SVN tree.\r
-</p>\r
-<p>By default, the whole tree on the SVN trunk (/trunk) is imported.\r
-<em>-P my/proj</em> will import starting only from <em>/trunk/my/proj</em>.\r
-This option is useful when you want to import one project from a\r
-svn repo which hosts multiple projects under the same trunk.</p>\r
-</dd>\r
-<dt>\r
--v\r
-</dt>\r
-<dd>\r
-<p>\r
- Verbosity: let <em>svnimport</em> report what it is doing.\r
-</p>\r
-</dd>\r
-<dt>\r
--d\r
-</dt>\r
-<dd>\r
-<p>\r
- Use direct HTTP requests if possible. The "<path>" argument is used\r
- only for retrieving the SVN logs; the path to the contents is\r
- included in the SVN log.\r
-</p>\r
-</dd>\r
-<dt>\r
--D\r
-</dt>\r
-<dd>\r
-<p>\r
- Use direct HTTP requests if possible. The "<path>" argument is used\r
- for retrieving the logs, as well as for the contents.\r
-</p>\r
-<p>There's no safe way to automatically find out which of these options to\r
-use, so you need to try both. Usually, the one that's wrong will die\r
-with a 40x error pretty quickly.</p>\r
-</dd>\r
-<dt>\r
-<SVN_repository_URL>\r
-</dt>\r
-<dd>\r
-<p>\r
- The URL of the SVN module you want to import. For local\r
- repositories, use "file:///absolute/path".\r
-</p>\r
-<p>If you're using the "-d" or "-D" option, this is the URL of the SVN\r
-repository itself; it usually ends in "/svn".</p>\r
-</dd>\r
-<dt>\r
-<path>\r
-</dt>\r
-<dd>\r
-<p>\r
- The path to the module you want to check out.\r
-</p>\r
-</dd>\r
-<dt>\r
--h\r
-</dt>\r
-<dd>\r
-<p>\r
- Print a short usage message and exit.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>OUTPUT</h2>\r
-<div class="sectionbody">\r
-<p>If <em>-v</em> is specified, the script reports what it is doing.</p>\r
-<p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with\r
-a zero exit status.</p>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from\r
-various participants of the git-list <git@vger.kernel.org>.</p>\r
-<p>Based on a cvs2git script by the same author.</p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by Matthias Urlichs <smurf@smurf.noris.de>.</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 23-Aug-2007 00:24:06 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:52 UTC\r
+Last updated 01-Jun-2008 08:21:50 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 12-Apr-2008 08:22:50 UTC\r
+Last updated 01-Jun-2008 08:21:50 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:54 UTC\r
+Last updated 01-Jun-2008 08:21:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:14 UTC\r
+Last updated 01-Jun-2008 08:22:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:54 UTC\r
+Last updated 01-Jun-2008 08:21:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 30-Apr-2008 08:42:08 UTC\r
+Last updated 01-Jun-2008 08:21:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:38 UTC\r
+Last updated 01-Jun-2008 08:21:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:56 UTC\r
+Last updated 01-Jun-2008 08:21:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:57 UTC\r
+Last updated 01-Jun-2008 08:21:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:57 UTC\r
+Last updated 01-Jun-2008 08:21:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:57 UTC\r
+Last updated 01-Jun-2008 08:21:52 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-upload-tar(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-upload-tar(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-upload-tar -\r
- Send tar archive\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-upload-tar</em> <directory></p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>Invoked by <em>git-tar-tree --remote</em> and sends a generated tar archive\r
-to the other end over the git protocol.</p>\r
-<p>This command is usually not invoked directly by the end user.\r
-The UI for the protocol is on the <em>git-tar-tree</em> side, and the\r
-program pair is meant to be used to get a tar archive from a\r
-remote repository.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
-<directory>\r
-</dt>\r
-<dd>\r
-<p>\r
- The repository to get a tar archive from.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Junio C Hamano <junio@kernel.org></p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano.</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 15-Jul-2006 01:38:20 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:38 UTC\r
+Last updated 01-Jun-2008 08:21:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Mar-2008 02:00:00 UTC\r
+Last updated 01-Jun-2008 08:21:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:58 UTC\r
+Last updated 01-Jun-2008 08:21:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-May-2008 06:12:01 UTC\r
+Last updated 01-Jun-2008 08:21:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-Apr-2008 09:38:29 UTC\r
+Last updated 01-Jun-2008 08:21:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:59 UTC\r
+Last updated 01-Jun-2008 08:21:53 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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-zip-tree(1)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>\r
-git-zip-tree(1) Manual Page\r
-</h1>\r
-<h2>NAME</h2>\r
-<div class="sectionbody">\r
-<p>git-zip-tree -\r
- Creates a ZIP archive of the files in the named tree\r
-</p>\r
-</div>\r
-</div>\r
-<h2>SYNOPSIS</h2>\r
-<div class="sectionbody">\r
-<p><em>git-zip-tree</em> [-0|…|-9] <tree-ish> [ <base> ]</p>\r
-</div>\r
-<h2>DESCRIPTION</h2>\r
-<div class="sectionbody">\r
-<p>Creates a ZIP archive containing the tree structure for the named tree.\r
-When <base> is specified it is added as a leading path to the files in the\r
-generated ZIP archive.</p>\r
-<p>git-zip-tree behaves differently when given a tree ID versus when given\r
-a commit ID or tag ID. In the first case the current time is used as\r
-modification time of each file in the archive. In the latter case the\r
-commit time as recorded in the referenced commit object is used instead.\r
-Additionally the commit ID is stored as an archive comment.</p>\r
-<p>Currently git-zip-tree can handle only files and directories, symbolic\r
-links are not supported.</p>\r
-</div>\r
-<h2>OPTIONS</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
--0\r
-</dt>\r
-<dd>\r
-<p>\r
- Store the files instead of deflating them.\r
-</p>\r
-</dd>\r
-<dt>\r
--9\r
-</dt>\r
-<dd>\r
-<p>\r
- Highest and slowest compression level. You can specify any\r
- number from 1 to 9 to adjust compression speed and ratio.\r
-</p>\r
-</dd>\r
-<dt>\r
-<tree-ish>\r
-</dt>\r
-<dd>\r
-<p>\r
- The tree or commit to produce ZIP archive for. If it is\r
- the object name of a commit object.\r
-</p>\r
-</dd>\r
-<dt>\r
-<base>\r
-</dt>\r
-<dd>\r
-<p>\r
- Leading path to the files in the resulting ZIP archive.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>EXAMPLES</h2>\r
-<div class="sectionbody">\r
-<dl>\r
-<dt>\r
-git zip-tree v1.4.0 git-1.4.0 >git-1.4.0.zip\r
-</dt>\r
-<dd>\r
-<p>\r
- Create a ZIP file for v1.4.0 release.\r
-</p>\r
-</dd>\r
-<dt>\r
-git zip-tree HEAD:Documentation/ git-docs >docs.zip\r
-</dt>\r
-<dd>\r
-<p>\r
- Put everything in the current head's Documentation/ directory\r
- into <em>docs.zip</em>, with the prefix <em>git-docs/</em>.\r
-</p>\r
-</dd>\r
-</dl>\r
-</div>\r
-<h2>Author</h2>\r
-<div class="sectionbody">\r
-<p>Written by Rene Scharfe.</p>\r
-</div>\r
-<h2>Documentation</h2>\r
-<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.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 27-Aug-2006 04:54:06 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 28-May-2008 08:06:40 UTC\r
+Last updated 01-Jun-2008 08:22:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Mar-2008 23:49:28 UTC\r
+Last updated 01-Jun-2008 08:21:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-May-2008 22:24:43 UTC\r
+Last updated 01-Jun-2008 08:21:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:52 UTC\r
+Last updated 01-Jun-2008 08:21:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-May-2008 22:24:43 UTC\r
+Last updated 01-Jun-2008 08:21:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Mar-2008 23:49:28 UTC\r
+Last updated 01-Jun-2008 08:21:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2008 02:08:39 UTC\r
+Last updated 01-Jun-2008 08:21:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:01 UTC\r
+Last updated 01-Jun-2008 08:21:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:51 UTC\r
+Last updated 01-Jun-2008 08:21:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:50 UTC\r
+Last updated 01-Jun-2008 08:21:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Mar-2008 09:10:23 UTC\r
+Last updated 01-Jun-2008 08:22:02 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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
-/* 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>Hooks used by git</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>Hooks used by git</h1>\r
-</div>\r
-<div id="preamble">\r
-<div class="sectionbody">\r
-<p>Hooks are little scripts you can place in <tt>$GIT_DIR/hooks</tt>\r
-directory to trigger action at certain points. When\r
-<tt>git-init</tt> is run, a handful example hooks are copied in the\r
-<tt>hooks</tt> directory of the new repository, but by default they are\r
-all disabled. To enable a hook, make it executable with <tt>chmod +x</tt>.</p>\r
-<p>This document describes the currently defined hooks.</p>\r
-</div>\r
-</div>\r
-<h2>applypatch-msg</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-am</tt> script. It takes a single\r
-parameter, the name of the file that holds the proposed commit\r
-log message. Exiting with non-zero status causes\r
-<tt>git-am</tt> to abort before applying the patch.</p>\r
-<p>The hook is allowed to edit the message file in place, and can\r
-be used to normalize the message into some project standard\r
-format (if the project has one). It can also be used to refuse\r
-the commit after inspecting the message file.</p>\r
-<p>The default <em>applypatch-msg</em> hook, when enabled, runs the\r
-<em>commit-msg</em> hook, if the latter is enabled.</p>\r
-</div>\r
-<h2>pre-applypatch</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-am</tt>. It takes no parameter, and is\r
-invoked after the patch is applied, but before a commit is made.</p>\r
-<p>If it exits with non-zero status, then the working tree will not be\r
-committed after applying the patch.</p>\r
-<p>It can be used to inspect the current working tree and refuse to\r
-make a commit if it does not pass certain test.</p>\r
-<p>The default <em>pre-applypatch</em> hook, when enabled, runs the\r
-<em>pre-commit</em> hook, if the latter is enabled.</p>\r
-</div>\r
-<h2>post-applypatch</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-am</tt>. It takes no parameter,\r
-and is invoked after the patch is applied and a commit is made.</p>\r
-<p>This hook is meant primarily for notification, and cannot affect\r
-the outcome of <tt>git-am</tt>.</p>\r
-</div>\r
-<h2>pre-commit</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-commit</tt>, and can be bypassed\r
-with <tt>--no-verify</tt> option. It takes no parameter, and is\r
-invoked before obtaining the proposed commit log message and\r
-making a commit. Exiting with non-zero status from this script\r
-causes the <tt>git-commit</tt> to abort.</p>\r
-<p>The default <em>pre-commit</em> hook, when enabled, catches introduction\r
-of lines with trailing whitespaces and aborts the commit when\r
-such a line is found.</p>\r
-<p>All the <tt>git-commit</tt> hooks are invoked with the environment\r
-variable <tt>GIT_EDITOR=:</tt> if the command will not bring up an editor\r
-to modify the commit message.</p>\r
-</div>\r
-<h2>prepare-commit-msg</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-commit</tt> right after preparing the\r
-default log message, and before the editor is started.</p>\r
-<p>It takes one to three parameters. The first is the name of the file\r
-that the commit log message. The second is the source of the commit\r
-message, and can be: <tt>message</tt> (if a <tt>\-m</tt> or <tt>\-F</tt> option was\r
-given); <tt>template</tt> (if a <tt>\-t</tt> option was given or the\r
-configuration option <tt>commit.template</tt> is set); <tt>merge</tt> (if the\r
-commit is a merge or a <tt>.git/MERGE_MSG</tt> file exists); <tt>squash</tt>\r
-(if a <tt>.git/SQUASH_MSG</tt> file exists); or <tt>commit</tt>, followed by\r
-a commit SHA1 (if a <tt>\-c</tt>, <tt>\-C</tt> or <tt>--amend</tt> option was given).</p>\r
-<p>If the exit status is non-zero, <tt>git-commit</tt> will abort.</p>\r
-<p>The purpose of the hook is to edit the message file in place, and\r
-it is not suppressed by the <tt>--no-verify</tt> option. A non-zero exit\r
-means a failure of the hook and aborts the commit. It should not\r
-be used as replacement for pre-commit hook.</p>\r
-<p>The sample <tt>prepare-commit-msg</tt> hook that comes with git comments\r
-out the <tt>Conflicts:</tt> part of a merge's commit message.</p>\r
-</div>\r
-<h2>commit-msg</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-commit</tt>, and can be bypassed\r
-with <tt>--no-verify</tt> option. It takes a single parameter, the\r
-name of the file that holds the proposed commit log message.\r
-Exiting with non-zero status causes the <tt>git-commit</tt> to\r
-abort.</p>\r
-<p>The hook is allowed to edit the message file in place, and can\r
-be used to normalize the message into some project standard\r
-format (if the project has one). It can also be used to refuse\r
-the commit after inspecting the message file.</p>\r
-<p>The default <em>commit-msg</em> hook, when enabled, detects duplicate\r
-"Signed-off-by" lines, and aborts the commit if one is found.</p>\r
-</div>\r
-<h2>post-commit</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-commit</tt>. It takes no\r
-parameter, and is invoked after a commit is made.</p>\r
-<p>This hook is meant primarily for notification, and cannot affect\r
-the outcome of <tt>git-commit</tt>.</p>\r
-</div>\r
-<h2>post-checkout</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked when a <tt>git-checkout</tt> is run after having updated the\r
-worktree. The hook is given three parameters: the ref of the previous HEAD,\r
-the ref of the new HEAD (which may or may not have changed), and a flag\r
-indicating whether the checkout was a branch checkout (changing branches,\r
-flag=1) or a file checkout (retrieving a file from the index, flag=0).\r
-This hook cannot affect the outcome of <tt>git-checkout</tt>.</p>\r
-<p>This hook can be used to perform repository validity checks, auto-display\r
-differences from the previous HEAD if different, or set working dir metadata\r
-properties.</p>\r
-</div>\r
-<h2>post-merge</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-merge</tt>, which happens when a <tt>git pull</tt>\r
-is done on a local repository. The hook takes a single parameter, a status\r
-flag specifying whether or not the merge being done was a squash merge.\r
-This hook cannot affect the outcome of <tt>git-merge</tt> and is not executed,\r
-if the merge failed due to conflicts.</p>\r
-<p>This hook can be used in conjunction with a corresponding pre-commit hook to\r
-save and restore any form of metadata associated with the working tree\r
-(eg: permissions/ownership, ACLS, etc). See contrib/hooks/setgitperms.perl\r
-for an example of how to do this.</p>\r
-</div>\r
-<h2><a id="pre-receive"></a>pre-receive</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,\r
-which happens when a <tt>git push</tt> is done on a local repository.\r
-Just before starting to update refs on the remote repository, the\r
-pre-receive hook is invoked. Its exit status determines the success\r
-or failure of the update.</p>\r
-<p>This hook executes once for the receive operation. It takes no\r
-arguments, but for each ref to be updated it receives on standard\r
-input a line of the format:</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt><old-value> SP <new-value> SP <ref-name> LF</tt></pre>\r
-</div></div>\r
-<p>where <tt><old-value></tt> is the old object name stored in the ref,\r
-<tt><new-value></tt> is the new object name to be stored in the ref and\r
-<tt><ref-name></tt> is the full name of the ref.\r
-When creating a new ref, <tt><old-value></tt> is 40 <tt>0</tt>.</p>\r
-<p>If the hook exits with non-zero status, none of the refs will be\r
-updated. If the hook exits with zero, updating of individual refs can\r
-still be prevented by the <a href="#update"><em>update</em></a> hook.</p>\r
-<p>Both standard output and standard error output are forwarded to\r
-<tt>git-send-pack</tt> on the other end, so you can simply <tt>echo</tt> messages\r
-for the user.</p>\r
-</div>\r
-<h2><a id="update"></a>update</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,\r
-which happens when a <tt>git push</tt> is done on a local repository.\r
-Just before updating the ref on the remote repository, the update hook\r
-is invoked. Its exit status determines the success or failure of\r
-the ref update.</p>\r
-<p>The hook executes once for each ref to be updated, and takes\r
-three parameters:</p>\r
-<ul>\r
-<li>\r
-<p>\r
-the name of the ref being updated,\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-the old object name stored in the ref,\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-and the new objectname to be stored in the ref.\r
-</p>\r
-</li>\r
-</ul>\r
-<p>A zero exit from the update hook allows the ref to be updated.\r
-Exiting with a non-zero status prevents <tt>git-receive-pack</tt>\r
-from updating that ref.</p>\r
-<p>This hook can be used to prevent <em>forced</em> update on certain refs by\r
-making sure that the object name is a commit object that is a\r
-descendant of the commit object named by the old object name.\r
-That is, to enforce a "fast forward only" policy.</p>\r
-<p>It could also be used to log the old..new status. However, it\r
-does not know the entire set of branches, so it would end up\r
-firing one e-mail per ref when used naively, though. The\r
-<a href="#post-receive"><em>post-receive</em></a> hook is more suited to that.</p>\r
-<p>Another use suggested on the mailing list is to use this hook to\r
-implement access control which is finer grained than the one\r
-based on filesystem group.</p>\r
-<p>Both standard output and standard error output are forwarded to\r
-<tt>git-send-pack</tt> on the other end, so you can simply <tt>echo</tt> messages\r
-for the user.</p>\r
-<p>The default <em>update</em> hook, when enabled—and with\r
-<tt>hooks.allowunannotated</tt> config option turned on—prevents\r
-unannotated tags to be pushed.</p>\r
-</div>\r
-<h2><a id="post-receive"></a>post-receive</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,\r
-which happens when a <tt>git push</tt> is done on a local repository.\r
-It executes on the remote repository once after all the refs have\r
-been updated.</p>\r
-<p>This hook executes once for the receive operation. It takes no\r
-arguments, but gets the same information as the\r
-<a href="#pre-receive"><em>pre-receive</em></a>\r
-hook does on its standard input.</p>\r
-<p>This hook does not affect the outcome of <tt>git-receive-pack</tt>, as it\r
-is called after the real work is done.</p>\r
-<p>This supersedes the <a href="#post-update"><em>post-update</em></a> hook in that it gets\r
-both old and new values of all the refs in addition to their\r
-names.</p>\r
-<p>Both standard output and standard error output are forwarded to\r
-<tt>git-send-pack</tt> on the other end, so you can simply <tt>echo</tt> messages\r
-for the user.</p>\r
-<p>The default <em>post-receive</em> hook is empty, but there is\r
-a sample script <tt>post-receive-email</tt> provided in the <tt>contrib/hooks</tt>\r
-directory in git distribution, which implements sending commit\r
-emails.</p>\r
-</div>\r
-<h2><a id="post-update"></a>post-update</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,\r
-which happens when a <tt>git push</tt> is done on a local repository.\r
-It executes on the remote repository once after all the refs have\r
-been updated.</p>\r
-<p>It takes a variable number of parameters, each of which is the\r
-name of ref that was actually updated.</p>\r
-<p>This hook is meant primarily for notification, and cannot affect\r
-the outcome of <tt>git-receive-pack</tt>.</p>\r
-<p>The <em>post-update</em> hook can tell what are the heads that were pushed,\r
-but it does not know what their original and updated values are,\r
-so it is a poor place to do log old..new. The\r
-<a href="#post-receive"><em>post-receive</em></a> hook does get both original and\r
-updated values of the refs. You might consider it instead if you need\r
-them.</p>\r
-<p>When enabled, the default <em>post-update</em> hook runs\r
-<tt>git-update-server-info</tt> to keep the information used by dumb\r
-transports (e.g., HTTP) up-to-date. If you are publishing\r
-a git repository that is accessible via HTTP, you should\r
-probably enable this hook.</p>\r
-<p>Both standard output and standard error output are forwarded to\r
-<tt>git-send-pack</tt> on the other end, so you can simply <tt>echo</tt> messages\r
-for the user.</p>\r
-</div>\r
-<h2>pre-auto-gc</h2>\r
-<div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-gc —auto</tt>. It takes no parameter, and\r
-exiting with non-zero status from this script causes the <tt>git-gc —auto</tt>\r
-to abort.</p>\r
-</div>\r
-<div id="footer">\r
-<div id="footer-text">\r
-Last updated 06-May-2008 06:35:00 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Apr-2008 08:17:01 UTC\r
+Last updated 01-Jun-2008 08:22:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:15 UTC\r
+Last updated 01-Jun-2008 08:22:03 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Jan-2008 08:30:42 UTC\r
+Last updated 01-Jun-2008 08:22:03 UTC\r
</div>\r
</div>\r
</body>\r
<repository>::
The "remote" repository that is the source of a fetch
- or pull operation. See the section <<URLS,GIT URLS>> below.
+ or pull operation. This parameter can be either a URL
+ (see the section <<URLS,GIT URLS>> below) or the name
+ of a remote (see the section <<REMOTES,REMOTES>> below).
<refspec>::
The canonical format of a <refspec> parameter is
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-May-2008 22:24:44 UTC\r
+Last updated 01-Jun-2008 08:21:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:17 UTC\r
+Last updated 01-Jun-2008 08:22:03 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:18 UTC\r
+Last updated 01-Jun-2008 08:22:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:19 UTC\r
+Last updated 01-Jun-2008 08:22:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-Feb-2008 09:20:49 UTC\r
+Last updated 01-Jun-2008 08:22:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:23 UTC\r
+Last updated 01-Jun-2008 08:22:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:24 UTC\r
+Last updated 01-Jun-2008 08:22:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:25 UTC\r
+Last updated 01-Jun-2008 08:22:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:26 UTC\r
+Last updated 01-Jun-2008 08:22:06 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-May-2008 01:14:54 UTC\r
+Last updated 01-Jun-2008 08:22:06 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:26 UTC\r
+Last updated 01-Jun-2008 08:22:06 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-May-2008 00:52:49 UTC\r
+Last updated 01-Jun-2008 08:22:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-Jan-2008 02:42:45 UTC\r
+Last updated 01-Jun-2008 08:22:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:28 UTC\r
+Last updated 01-Jun-2008 08:22:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:28 UTC\r
+Last updated 01-Jun-2008 08:22:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:29 UTC\r
+Last updated 01-Jun-2008 08:22:08 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:29 UTC\r
+Last updated 01-Jun-2008 08:22:08 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-Feb-2008 10:44:09 UTC\r
+Last updated 01-Jun-2008 08:22:09 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
+<p>The revision walking API offers functions to build a list of revisions\r
+and then iterate over that list.</p>\r
+</div>\r
+</div>\r
+<h2>Calling sequence</h2>\r
+<div class="sectionbody">\r
+<p>The walking API has a given calling sequence: first you need to\r
+initialize a rev_info structure, then add revisions to control what kind\r
+of revision list do you want to get, finally you can iterate over the\r
+revision list.</p>\r
+</div>\r
+<h2>Functions</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+<tt>init_revisions</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Initialize a rev_info structure with default values. The second\r
+ parameter may be NULL or can be prefix path, and then the <tt>.prefix</tt>\r
+ variable will be set to it. This is typically the first function you\r
+ want to call when you want to deal with a revision list. After calling\r
+ this function, you are free to customize options, like set\r
+ <tt>.ignore_merges</tt> to 0 if you don't want to ignore merges, and so on. See\r
+ <tt>revision.h</tt> for a complete list of available options.\r
+</p>\r
+</dd>\r
+<dt>\r
+<tt>add_pending_object</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ This function can be used if you want to add commit objects as revision\r
+ information. You can use the <tt>UNINTERESTING</tt> object flag to indicate if\r
+ you want to include or exclude the given commit (and commits reachable\r
+ from the given commit) from the revision list.\r
+</p>\r
+<div class="admonitionblock">\r
+<table><tr>\r
+<td class="icon">\r
+<div class="title">Note</div>\r
+</td>\r
+<td class="content">If you have the commits as a string list then you probably want to\r
+use setup_revisions(), instead of parsing each string and using this\r
+function.</td>\r
+</tr></table>\r
+</div>\r
+</dd>\r
+<dt>\r
+<tt>setup_revisions</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Parse revision information, filling in the <tt>rev_info</tt> structure, and\r
+ removing the used arguments from the argument list. Returns the number\r
+ of arguments left that weren't recognized, which are also moved to the\r
+ head of the argument list. The last parameter is used in case no\r
+ parameter given by the first two arguments.\r
+</p>\r
+</dd>\r
+<dt>\r
+<tt>prepare_revision_walk</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Prepares the rev_info structure for a walk. You should check if it\r
+ returns any error (non-zero return code) and if it does not, you can\r
+ start using get_revision() to do the iteration.\r
+</p>\r
+</dd>\r
+<dt>\r
+<tt>get_revision</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Takes a pointer to a <tt>rev_info</tt> structure and iterates over it,\r
+ returning a <tt>struct commit *</tt> each time you call it. The end of the\r
+ revision list is indicated by returning a NULL pointer.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Data structures</h2>\r
+<div class="sectionbody">\r
<p>Talk about <revision.h>, things like:</p>\r
<ul>\r
<li>\r
</li>\r
<li>\r
<p>\r
-calling sequence: init_revisions(), setup_revsions(), get_revision();\r
+remaining functions;\r
</p>\r
</li>\r
</ul>\r
<p>(Linus, JC, Dscho)</p>\r
</div>\r
-</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:29 UTC\r
+Last updated 01-Jun-2008 08:22:09 UTC\r
</div>\r
</div>\r
</body>\r
revision walking API
====================
+The revision walking API offers functions to build a list of revisions
+and then iterate over that list.
+
+Calling sequence
+----------------
+
+The walking API has a given calling sequence: first you need to
+initialize a rev_info structure, then add revisions to control what kind
+of revision list do you want to get, finally you can iterate over the
+revision list.
+
+Functions
+---------
+
+`init_revisions`::
+
+ Initialize a rev_info structure with default values. The second
+ parameter may be NULL or can be prefix path, and then the `.prefix`
+ variable will be set to it. This is typically the first function you
+ want to call when you want to deal with a revision list. After calling
+ this function, you are free to customize options, like set
+ `.ignore_merges` to 0 if you don't want to ignore merges, and so on. See
+ `revision.h` for a complete list of available options.
+
+`add_pending_object`::
+
+ This function can be used if you want to add commit objects as revision
+ information. You can use the `UNINTERESTING` object flag to indicate if
+ you want to include or exclude the given commit (and commits reachable
+ from the given commit) from the revision list.
++
+NOTE: If you have the commits as a string list then you probably want to
+use setup_revisions(), instead of parsing each string and using this
+function.
+
+`setup_revisions`::
+
+ Parse revision information, filling in the `rev_info` structure, and
+ removing the used arguments from the argument list. Returns the number
+ of arguments left that weren't recognized, which are also moved to the
+ head of the argument list. The last parameter is used in case no
+ parameter given by the first two arguments.
+
+`prepare_revision_walk`::
+
+ Prepares the rev_info structure for a walk. You should check if it
+ returns any error (non-zero return code) and if it does not, you can
+ start using get_revision() to do the iteration.
+
+`get_revision`::
+
+ Takes a pointer to a `rev_info` structure and iterates over it,
+ returning a `struct commit *` each time you call it. The end of the
+ revision list is indicated by returning a NULL pointer.
+
+Data structures
+---------------
+
Talk about <revision.h>, things like:
* two diff_options, one for path limiting, another for output;
-* calling sequence: init_revisions(), setup_revsions(), get_revision();
+* remaining functions;
(Linus, JC, Dscho)
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-Mar-2008 09:30:02 UTC\r
+Last updated 01-Jun-2008 08:22:09 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:29 UTC\r
+Last updated 01-Jun-2008 08:22:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:30 UTC\r
+Last updated 01-Jun-2008 08:22:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:30 UTC\r
+Last updated 01-Jun-2008 08:22:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:30 UTC\r
+Last updated 01-Jun-2008 08:22:10 UTC\r
</div>\r
</div>\r
</body>\r
+++ /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
-/* 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>A tutorial introduction to git: part two</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>A tutorial introduction to git: part two</h1>\r
-</div>\r
-<div id="preamble">\r
-<div class="sectionbody">\r
-<p>You should work through <a href="tutorial.html">A tutorial introduction to\r
-git</a> before reading this tutorial.</p>\r
-<p>The goal of this tutorial is to introduce two fundamental pieces of\r
-git's architecture—the object database and the index file—and to\r
-provide the reader with everything necessary to understand the rest\r
-of the git documentation.</p>\r
-</div>\r
-</div>\r
-<h2>The git object database</h2>\r
-<div class="sectionbody">\r
-<p>Let's start a new project and create a small amount of history:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ mkdir test-project\r
-$ cd test-project\r
-$ git init\r
-Initialized empty Git repository in .git/\r
-$ echo 'hello world' > file.txt\r
-$ git add .\r
-$ git commit -a -m "initial commit"\r
-Created initial commit 54196cc2703dc165cbd373a65a4dcf22d50ae7f7\r
- create mode 100644 file.txt\r
-$ echo 'hello world!' >file.txt\r
-$ git commit -a -m "add emphasis"\r
-Created commit c4d59f390b9cfd4318117afde11d601c1085f241</tt></pre>\r
-</div></div>\r
-<p>What are the 40 digits of hex that git responded to the commit with?</p>\r
-<p>We saw in part one of the tutorial that commits have names like this.\r
-It turns out that every object in the git history is stored under\r
-such a 40-digit hex name. That name is the SHA1 hash of the object's\r
-contents; among other things, this ensures that git will never store\r
-the same data twice (since identical data is given an identical SHA1\r
-name), and that the contents of a git object will never change (since\r
-that would change the object's name as well).</p>\r
-<p>It is expected that the content of the commit object you created while\r
-following the example above generates a different SHA1 hash than\r
-the one shown above because the commit object records the time when\r
-it was created and the name of the person performing the commit.</p>\r
-<p>We can ask git about this particular object with the cat-file\r
-command. Don't copy the 40 hex digits from this example but use those\r
-from your own version. Note that you can shorten it to only a few\r
-characters to save yourself typing all 40 hex digits:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git-cat-file -t 54196cc2\r
-commit\r
-$ git-cat-file commit 54196cc2\r
-tree 92b8b694ffb1675e5975148e1121810081dbdffe\r
-author J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500\r
-committer J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500\r
-\r
-initial commit</tt></pre>\r
-</div></div>\r
-<p>A tree can refer to one or more "blob" objects, each corresponding to\r
-a file. In addition, a tree can also refer to other tree objects,\r
-thus creating a directory hierarchy. You can examine the contents of\r
-any tree using ls-tree (remember that a long enough initial portion\r
-of the SHA1 will also work):</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git ls-tree 92b8b694\r
-100644 blob 3b18e512dba79e4c8300dd08aeb37f8e728b8dad file.txt</tt></pre>\r
-</div></div>\r
-<p>Thus we see that this tree has one file in it. The SHA1 hash is a\r
-reference to that file's data:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git cat-file -t 3b18e512\r
-blob</tt></pre>\r
-</div></div>\r
-<p>A "blob" is just file data, which we can also examine with cat-file:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git cat-file blob 3b18e512\r
-hello world</tt></pre>\r
-</div></div>\r
-<p>Note that this is the old file data; so the object that git named in\r
-its response to the initial tree was a tree with a snapshot of the\r
-directory state that was recorded by the first commit.</p>\r
-<p>All of these objects are stored under their SHA1 names inside the git\r
-directory:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ find .git/objects/\r
-.git/objects/\r
-.git/objects/pack\r
-.git/objects/info\r
-.git/objects/3b\r
-.git/objects/3b/18e512dba79e4c8300dd08aeb37f8e728b8dad\r
-.git/objects/92\r
-.git/objects/92/b8b694ffb1675e5975148e1121810081dbdffe\r
-.git/objects/54\r
-.git/objects/54/196cc2703dc165cbd373a65a4dcf22d50ae7f7\r
-.git/objects/a0\r
-.git/objects/a0/423896973644771497bdc03eb99d5281615b51\r
-.git/objects/d0\r
-.git/objects/d0/492b368b66bdabf2ac1fd8c92b39d3db916e59\r
-.git/objects/c4\r
-.git/objects/c4/d59f390b9cfd4318117afde11d601c1085f241</tt></pre>\r
-</div></div>\r
-<p>and the contents of these files is just the compressed data plus a\r
-header identifying their length and their type. The type is either a\r
-blob, a tree, a commit, or a tag.</p>\r
-<p>The simplest commit to find is the HEAD commit, which we can find\r
-from .git/HEAD:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ cat .git/HEAD\r
-ref: refs/heads/master</tt></pre>\r
-</div></div>\r
-<p>As you can see, this tells us which branch we're currently on, and it\r
-tells us this by naming a file under the .git directory, which itself\r
-contains a SHA1 name referring to a commit object, which we can\r
-examine with cat-file:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ cat .git/refs/heads/master\r
-c4d59f390b9cfd4318117afde11d601c1085f241\r
-$ git cat-file -t c4d59f39\r
-commit\r
-$ git cat-file commit c4d59f39\r
-tree d0492b368b66bdabf2ac1fd8c92b39d3db916e59\r
-parent 54196cc2703dc165cbd373a65a4dcf22d50ae7f7\r
-author J. Bruce Fields <bfields@puzzle.fieldses.org> 1143418702 -0500\r
-committer J. Bruce Fields <bfields@puzzle.fieldses.org> 1143418702 -0500\r
-\r
-add emphasis</tt></pre>\r
-</div></div>\r
-<p>The "tree" object here refers to the new state of the tree:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git ls-tree d0492b36\r
-100644 blob a0423896973644771497bdc03eb99d5281615b51 file.txt\r
-$ git cat-file blob a0423896\r
-hello world!</tt></pre>\r
-</div></div>\r
-<p>and the "parent" object refers to the previous commit:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git-cat-file commit 54196cc2\r
-tree 92b8b694ffb1675e5975148e1121810081dbdffe\r
-author J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500\r
-committer J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500\r
-\r
-initial commit</tt></pre>\r
-</div></div>\r
-<p>The tree object is the tree we examined first, and this commit is\r
-unusual in that it lacks any parent.</p>\r
-<p>Most commits have only one parent, but it is also common for a commit\r
-to have multiple parents. In that case the commit represents a\r
-merge, with the parent references pointing to the heads of the merged\r
-branches.</p>\r
-<p>Besides blobs, trees, and commits, the only remaining type of object\r
-is a "tag", which we won't discuss here; refer to <a href="git-tag.html">git-tag(1)</a>\r
-for details.</p>\r
-<p>So now we know how git uses the object database to represent a\r
-project's history:</p>\r
-<ul>\r
-<li>\r
-<p>\r
-"commit" objects refer to "tree" objects representing the\r
- snapshot of a directory tree at a particular point in the\r
- history, and refer to "parent" commits to show how they're\r
- connected into the project history.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-"tree" objects represent the state of a single directory,\r
- associating directory names to "blob" objects containing file\r
- data and "tree" objects containing subdirectory information.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-"blob" objects contain file data without any other structure.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-References to commit objects at the head of each branch are\r
- stored in files under .git/refs/heads/.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-The name of the current branch is stored in .git/HEAD.\r
-</p>\r
-</li>\r
-</ul>\r
-<p>Note, by the way, that lots of commands take a tree as an argument.\r
-But as we can see above, a tree can be referred to in many different\r
-ways—by the SHA1 name for that tree, by the name of a commit that\r
-refers to the tree, by the name of a branch whose head refers to that\r
-tree, etc.—and most such commands can accept any of these names.</p>\r
-<p>In command synopses, the word "tree-ish" is sometimes used to\r
-designate such an argument.</p>\r
-</div>\r
-<h2>The index file</h2>\r
-<div class="sectionbody">\r
-<p>The primary tool we've been using to create commits is "git commit\r
--a", which creates a commit including every change you've made to\r
-your working tree. But what if you want to commit changes only to\r
-certain files? Or only certain changes to certain files?</p>\r
-<p>If we look at the way commits are created under the cover, we'll see\r
-that there are more flexible ways creating commits.</p>\r
-<p>Continuing with our test-project, let's modify file.txt again:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ echo "hello world, again" >>file.txt</tt></pre>\r
-</div></div>\r
-<p>but this time instead of immediately making the commit, let's take an\r
-intermediate step, and ask for diffs along the way to keep track of\r
-what's happening:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git diff\r
---- a/file.txt\r
-+++ b/file.txt\r
-@@ -1 +1,2 @@\r
- hello world!\r
-+hello world, again\r
-$ git add file.txt\r
-$ git diff</tt></pre>\r
-</div></div>\r
-<p>The last diff is empty, but no new commits have been made, and the\r
-head still doesn't contain the new line:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git-diff HEAD\r
-diff --git a/file.txt b/file.txt\r
-index a042389..513feba 100644\r
---- a/file.txt\r
-+++ b/file.txt\r
-@@ -1 +1,2 @@\r
- hello world!\r
-+hello world, again</tt></pre>\r
-</div></div>\r
-<p>So "git diff" is comparing against something other than the head.\r
-The thing that it's comparing against is actually the index file,\r
-which is stored in .git/index in a binary format, but whose contents\r
-we can examine with ls-files:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git ls-files --stage\r
-100644 513feba2e53ebbd2532419ded848ba19de88ba00 0 file.txt\r
-$ git cat-file -t 513feba2\r
-blob\r
-$ git cat-file blob 513feba2\r
-hello world!\r
-hello world, again</tt></pre>\r
-</div></div>\r
-<p>So what our "git add" did was store a new blob and then put\r
-a reference to it in the index file. If we modify the file again,\r
-we'll see that the new modifications are reflected in the "git-diff"\r
-output:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ echo 'again?' >>file.txt\r
-$ git diff\r
-index 513feba..ba3da7b 100644\r
---- a/file.txt\r
-+++ b/file.txt\r
-@@ -1,2 +1,3 @@\r
- hello world!\r
- hello world, again\r
-+again?</tt></pre>\r
-</div></div>\r
-<p>With the right arguments, git diff can also show us the difference\r
-between the working directory and the last commit, or between the\r
-index and the last commit:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git diff HEAD\r
-diff --git a/file.txt b/file.txt\r
-index a042389..ba3da7b 100644\r
---- a/file.txt\r
-+++ b/file.txt\r
-@@ -1 +1,3 @@\r
- hello world!\r
-+hello world, again\r
-+again?\r
-$ git diff --cached\r
-diff --git a/file.txt b/file.txt\r
-index a042389..513feba 100644\r
---- a/file.txt\r
-+++ b/file.txt\r
-@@ -1 +1,2 @@\r
- hello world!\r
-+hello world, again</tt></pre>\r
-</div></div>\r
-<p>At any time, we can create a new commit using "git commit" (without\r
-the -a option), and verify that the state committed only includes the\r
-changes stored in the index file, not the additional change that is\r
-still only in our working tree:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git commit -m "repeat"\r
-$ git diff HEAD\r
-diff --git a/file.txt b/file.txt\r
-index 513feba..ba3da7b 100644\r
---- a/file.txt\r
-+++ b/file.txt\r
-@@ -1,2 +1,3 @@\r
- hello world!\r
- hello world, again\r
-+again?</tt></pre>\r
-</div></div>\r
-<p>So by default "git commit" uses the index to create the commit, not\r
-the working tree; the -a option to commit tells it to first update\r
-the index with all changes in the working tree.</p>\r
-<p>Finally, it's worth looking at the effect of "git add" on the index\r
-file:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ echo "goodbye, world" >closing.txt\r
-$ git add closing.txt</tt></pre>\r
-</div></div>\r
-<p>The effect of the "git add" was to add one entry to the index file:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git ls-files --stage\r
-100644 8b9743b20d4b15be3955fc8d5cd2b09cd2336138 0 closing.txt\r
-100644 513feba2e53ebbd2532419ded848ba19de88ba00 0 file.txt</tt></pre>\r
-</div></div>\r
-<p>And, as you can see with cat-file, this new entry refers to the\r
-current contents of the file:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git cat-file blob 8b9743b2\r
-goodbye, world</tt></pre>\r
-</div></div>\r
-<p>The "status" command is a useful way to get a quick summary of the\r
-situation:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git status\r
-# On branch master\r
-# Changes to be committed:\r
-# (use "git reset HEAD <file>..." to unstage)\r
-#\r
-# new file: closing.txt\r
-#\r
-# Changed but not updated:\r
-# (use "git add <file>..." to update what will be committed)\r
-#\r
-# modified: file.txt\r
-#</tt></pre>\r
-</div></div>\r
-<p>Since the current state of closing.txt is cached in the index file,\r
-it is listed as "Changes to be committed". Since file.txt has\r
-changes in the working directory that aren't reflected in the index,\r
-it is marked "changed but not updated". At this point, running "git\r
-commit" would create a commit that added closing.txt (with its new\r
-contents), but that didn't modify file.txt.</p>\r
-<p>Also, note that a bare "git diff" shows the changes to file.txt, but\r
-not the addition of closing.txt, because the version of closing.txt\r
-in the index file is identical to the one in the working directory.</p>\r
-<p>In addition to being the staging area for new commits, the index file\r
-is also populated from the object database when checking out a\r
-branch, and is used to hold the trees involved in a merge operation.\r
-See the <a href="core-tutorial.html">core tutorial</a> and the relevant man\r
-pages for details.</p>\r
-</div>\r
-<h2>What next?</h2>\r
-<div class="sectionbody">\r
-<p>At this point you should know everything necessary to read the man\r
-pages for any of the git commands; one good place to start would be\r
-with the commands mentioned in <a href="everyday.html">Everyday git</a>. You\r
-should be able to find any unknown jargon in the\r
-<a href="glossary.html">Glossary</a>.</p>\r
-<p>The <a href="user-manual.html">Git User's Manual</a> provides a more\r
-comprehensive introduction to git.</p>\r
-<p>The <a href="cvs-migration.html">CVS migration</a> document explains how to\r
-import a CVS repository into git, and shows how to use git in a\r
-CVS-like way.</p>\r
-<p>For some interesting examples of git use, see the\r
-<a href="howto-index.html">howtos</a>.</p>\r
-<p>For git developers, the <a href="core-tutorial.html">Core tutorial</a> goes\r
-into detail on the lower-level git mechanisms involved in, for\r
-example, creating a new commit.</p>\r
-</div>\r
-<div id="footer">\r
-<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:03 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
+++ /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
-/* 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>A tutorial introduction to git (for version 1.5.1 or newer)</title>\r
-</head>\r
-<body>\r
-<div id="header">\r
-<h1>A tutorial introduction to git (for version 1.5.1 or newer)</h1>\r
-</div>\r
-<div id="preamble">\r
-<div class="sectionbody">\r
-<p>This tutorial explains how to import a new project into git, make\r
-changes to it, and share changes with other developers.</p>\r
-<p>If you are instead primarily interested in using git to fetch a project,\r
-for example, to test the latest version, you may prefer to start with\r
-the first two chapters of <a href="user-manual.html">The Git User's Manual</a>.</p>\r
-<p>First, note that you can get documentation for a command such as "git\r
-diff" with:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ man git-diff</tt></pre>\r
-</div></div>\r
-<p>It is a good idea to introduce yourself to git with your name and\r
-public email address before doing any operation. The easiest\r
-way to do so is:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git config --global user.name "Your Name Comes Here"\r
-$ git config --global user.email you@yourdomain.example.com</tt></pre>\r
-</div></div>\r
-</div>\r
-</div>\r
-<h2>Importing a new project</h2>\r
-<div class="sectionbody">\r
-<p>Assume you have a tarball project.tar.gz with your initial work. You\r
-can place it under git revision control as follows.</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ tar xzf project.tar.gz\r
-$ cd project\r
-$ git init</tt></pre>\r
-</div></div>\r
-<p>Git will reply</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>Initialized empty Git repository in .git/</tt></pre>\r
-</div></div>\r
-<p>You've now initialized the working directory—you may notice a new\r
-directory created, named ".git".</p>\r
-<p>Next, tell git to take a snapshot of the contents of all files under the\r
-current directory (note the <em>.</em>), with <a href="git-add.html">git-add(1)</a>:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git add .</tt></pre>\r
-</div></div>\r
-<p>This snapshot is now stored in a temporary staging area which git calls\r
-the "index". You can permanently store the contents of the index in the\r
-repository with <a href="git-commit.html">git-commit(1)</a>:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git commit</tt></pre>\r
-</div></div>\r
-<p>This will prompt you for a commit message. You've now stored the first\r
-version of your project in git.</p>\r
-</div>\r
-<h2>Making changes</h2>\r
-<div class="sectionbody">\r
-<p>Modify some files, then add their updated contents to the index:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git add file1 file2 file3</tt></pre>\r
-</div></div>\r
-<p>You are now ready to commit. You can see what is about to be committed\r
-using <a href="git-diff.html">git-diff(1)</a> with the —cached option:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git diff --cached</tt></pre>\r
-</div></div>\r
-<p>(Without —cached, <a href="git-diff.html">git-diff(1)</a> will show you any changes that\r
-you've made but not yet added to the index.) You can also get a brief\r
-summary of the situation with <a href="git-status.html">git-status(1)</a>:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git status\r
-# On branch master\r
-# Changes to be committed:\r
-# (use "git reset HEAD <file>..." to unstage)\r
-#\r
-# modified: file1\r
-# modified: file2\r
-# modified: file3\r
-#</tt></pre>\r
-</div></div>\r
-<p>If you need to make any further adjustments, do so now, and then add any\r
-newly modified content to the index. Finally, commit your changes with:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git commit</tt></pre>\r
-</div></div>\r
-<p>This will again prompt your for a message describing the change, and then\r
-record a new version of the project.</p>\r
-<p>Alternatively, instead of running <tt>git add</tt> beforehand, you can use</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git commit -a</tt></pre>\r
-</div></div>\r
-<p>which will automatically notice any modified (but not new) files, add\r
-them to the index, and commit, all in one step.</p>\r
-<p>A note on commit messages: Though not required, it's a good idea to\r
-begin the commit message with a single short (less than 50 character)\r
-line summarizing the change, followed by a blank line and then a more\r
-thorough description. Tools that turn commits into email, for\r
-example, use the first line on the Subject: line and the rest of the\r
-commit in the body.</p>\r
-</div>\r
-<h2>Git tracks content not files</h2>\r
-<div class="sectionbody">\r
-<p>Many revision control systems provide an "add" command that tells the\r
-system to start tracking changes to a new file. Git's "add" command\r
-does something simpler and more powerful: <tt>git add</tt> is used both for new\r
-and newly modified files, and in both cases it takes a snapshot of the\r
-given files and stages that content in the index, ready for inclusion in\r
-the next commit.</p>\r
-</div>\r
-<h2>Viewing project history</h2>\r
-<div class="sectionbody">\r
-<p>At any point you can view the history of your changes using</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git log</tt></pre>\r
-</div></div>\r
-<p>If you also want to see complete diffs at each step, use</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git log -p</tt></pre>\r
-</div></div>\r
-<p>Often the overview of the change is useful to get a feel of\r
-each step</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git log --stat --summary</tt></pre>\r
-</div></div>\r
-</div>\r
-<h2>Managing branches</h2>\r
-<div class="sectionbody">\r
-<p>A single git repository can maintain multiple branches of\r
-development. To create a new branch named "experimental", use</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git branch experimental</tt></pre>\r
-</div></div>\r
-<p>If you now run</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git branch</tt></pre>\r
-</div></div>\r
-<p>you'll get a list of all existing branches:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt> experimental\r
-* master</tt></pre>\r
-</div></div>\r
-<p>The "experimental" branch is the one you just created, and the\r
-"master" branch is a default branch that was created for you\r
-automatically. The asterisk marks the branch you are currently on;\r
-type</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git checkout experimental</tt></pre>\r
-</div></div>\r
-<p>to switch to the experimental branch. Now edit a file, commit the\r
-change, and switch back to the master branch:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>(edit file)\r
-$ git commit -a\r
-$ git checkout master</tt></pre>\r
-</div></div>\r
-<p>Check that the change you made is no longer visible, since it was\r
-made on the experimental branch and you're back on the master branch.</p>\r
-<p>You can make a different change on the master branch:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>(edit file)\r
-$ git commit -a</tt></pre>\r
-</div></div>\r
-<p>at this point the two branches have diverged, with different changes\r
-made in each. To merge the changes made in experimental into master, run</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git merge experimental</tt></pre>\r
-</div></div>\r
-<p>If the changes don't conflict, you're done. If there are conflicts,\r
-markers will be left in the problematic files showing the conflict;</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git diff</tt></pre>\r
-</div></div>\r
-<p>will show this. Once you've edited the files to resolve the\r
-conflicts,</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git commit -a</tt></pre>\r
-</div></div>\r
-<p>will commit the result of the merge. Finally,</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ gitk</tt></pre>\r
-</div></div>\r
-<p>will show a nice graphical representation of the resulting history.</p>\r
-<p>At this point you could delete the experimental branch with</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git branch -d experimental</tt></pre>\r
-</div></div>\r
-<p>This command ensures that the changes in the experimental branch are\r
-already in the current branch.</p>\r
-<p>If you develop on a branch crazy-idea, then regret it, you can always\r
-delete the branch with</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git branch -D crazy-idea</tt></pre>\r
-</div></div>\r
-<p>Branches are cheap and easy, so this is a good way to try something\r
-out.</p>\r
-</div>\r
-<h2>Using git for collaboration</h2>\r
-<div class="sectionbody">\r
-<p>Suppose that Alice has started a new project with a git repository in\r
-/home/alice/project, and that Bob, who has a home directory on the\r
-same machine, wants to contribute.</p>\r
-<p>Bob begins with:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git clone /home/alice/project myrepo</tt></pre>\r
-</div></div>\r
-<p>This creates a new directory "myrepo" containing a clone of Alice's\r
-repository. The clone is on an equal footing with the original\r
-project, possessing its own copy of the original project's history.</p>\r
-<p>Bob then makes some changes and commits them:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>(edit files)\r
-$ git commit -a\r
-(repeat as necessary)</tt></pre>\r
-</div></div>\r
-<p>When he's ready, he tells Alice to pull changes from the repository\r
-at /home/bob/myrepo. She does this with:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ cd /home/alice/project\r
-$ git pull /home/bob/myrepo master</tt></pre>\r
-</div></div>\r
-<p>This merges the changes from Bob's "master" branch into Alice's\r
-current branch. If Alice has made her own changes in the meantime,\r
-then she may need to manually fix any conflicts. (Note that the\r
-"master" argument in the above command is actually unnecessary, as it\r
-is the default.)</p>\r
-<p>The "pull" command thus performs two operations: it fetches changes\r
-from a remote branch, then merges them into the current branch.</p>\r
-<p>When you are working in a small closely knit group, it is not\r
-unusual to interact with the same repository over and over\r
-again. By defining <em>remote</em> repository shorthand, you can make\r
-it easier:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git remote add bob /home/bob/myrepo</tt></pre>\r
-</div></div>\r
-<p>With this, Alice can perform the first operation alone using the\r
-"git fetch" command without merging them with her own branch,\r
-using:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git fetch bob</tt></pre>\r
-</div></div>\r
-<p>Unlike the longhand form, when Alice fetches from Bob using a\r
-remote repository shorthand set up with <tt>git remote</tt>, what was\r
-fetched is stored in a remote tracking branch, in this case\r
-<tt>bob/master</tt>. So after this:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git log -p master..bob/master</tt></pre>\r
-</div></div>\r
-<p>shows a list of all the changes that Bob made since he branched from\r
-Alice's master branch.</p>\r
-<p>After examining those changes, Alice\r
-could merge the changes into her master branch:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git merge bob/master</tt></pre>\r
-</div></div>\r
-<p>This <tt>merge</tt> can also be done by <em>pulling from her own remote\r
-tracking branch</em>, like this:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git pull . remotes/bob/master</tt></pre>\r
-</div></div>\r
-<p>Note that git pull always merges into the current branch,\r
-regardless of what else is given on the command line.</p>\r
-<p>Later, Bob can update his repo with Alice's latest changes using</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git pull</tt></pre>\r
-</div></div>\r
-<p>Note that he doesn't need to give the path to Alice's repository;\r
-when Bob cloned Alice's repository, git stored the location of her\r
-repository in the repository configuration, and that location is\r
-used for pulls:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git config --get remote.origin.url\r
-/home/alice/project</tt></pre>\r
-</div></div>\r
-<p>(The complete configuration created by git-clone is visible using\r
-"git config -l", and the <a href="git-config.html">git-config(1)</a> man page\r
-explains the meaning of each option.)</p>\r
-<p>Git also keeps a pristine copy of Alice's master branch under the\r
-name "origin/master":</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git branch -r\r
- origin/master</tt></pre>\r
-</div></div>\r
-<p>If Bob later decides to work from a different host, he can still\r
-perform clones and pulls using the ssh protocol:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git clone alice.org:/home/alice/project myrepo</tt></pre>\r
-</div></div>\r
-<p>Alternatively, git has a native protocol, or can use rsync or http;\r
-see <a href="git-pull.html">git-pull(1)</a> for details.</p>\r
-<p>Git can also be used in a CVS-like mode, with a central repository\r
-that various users push changes to; see <a href="git-push.html">git-push(1)</a> and\r
-<a href="cvs-migration.html">git for CVS users</a>.</p>\r
-</div>\r
-<h2>Exploring history</h2>\r
-<div class="sectionbody">\r
-<p>Git history is represented as a series of interrelated commits. We\r
-have already seen that the git log command can list those commits.\r
-Note that first line of each git log entry also gives a name for the\r
-commit:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git log\r
-commit c82a22c39cbc32576f64f5c6b3f24b99ea8149c7\r
-Author: Junio C Hamano <junkio@cox.net>\r
-Date: Tue May 16 17:18:22 2006 -0700\r
-\r
- merge-base: Clarify the comments on post processing.</tt></pre>\r
-</div></div>\r
-<p>We can give this name to git show to see the details about this\r
-commit.</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7</tt></pre>\r
-</div></div>\r
-<p>But there are other ways to refer to commits. You can use any initial\r
-part of the name that is long enough to uniquely identify the commit:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git show c82a22c39c # the first few characters of the name are\r
- # usually enough\r
-$ git show HEAD # the tip of the current branch\r
-$ git show experimental # the tip of the "experimental" branch</tt></pre>\r
-</div></div>\r
-<p>Every commit usually has one "parent" commit\r
-which points to the previous state of the project:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git show HEAD^ # to see the parent of HEAD\r
-$ git show HEAD^^ # to see the grandparent of HEAD\r
-$ git show HEAD~4 # to see the great-great grandparent of HEAD</tt></pre>\r
-</div></div>\r
-<p>Note that merge commits may have more than one parent:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git show HEAD^1 # show the first parent of HEAD (same as HEAD^)\r
-$ git show HEAD^2 # show the second parent of HEAD</tt></pre>\r
-</div></div>\r
-<p>You can also give commits names of your own; after running</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git-tag v2.5 1b2e1d63ff</tt></pre>\r
-</div></div>\r
-<p>you can refer to 1b2e1d63ff by the name "v2.5". If you intend to\r
-share this name with other people (for example, to identify a release\r
-version), you should create a "tag" object, and perhaps sign it; see\r
-<a href="git-tag.html">git-tag(1)</a> for details.</p>\r
-<p>Any git command that needs to know a commit can take any of these\r
-names. For example:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git diff v2.5 HEAD # compare the current HEAD to v2.5\r
-$ git branch stable v2.5 # start a new branch named "stable" based\r
- # at v2.5\r
-$ git reset --hard HEAD^ # reset your current branch and working\r
- # directory to its state at HEAD^</tt></pre>\r
-</div></div>\r
-<p>Be careful with that last command: in addition to losing any changes\r
-in the working directory, it will also remove all later commits from\r
-this branch. If this branch is the only branch containing those\r
-commits, they will be lost. Also, don't use "git reset" on a\r
-publicly-visible branch that other developers pull from, as it will\r
-force needless merges on other developers to clean up the history.\r
-If you need to undo changes that you have pushed, use <a href="git-revert.html">git-revert(1)</a>\r
-instead.</p>\r
-<p>The git grep command can search for strings in any version of your\r
-project, so</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git grep "hello" v2.5</tt></pre>\r
-</div></div>\r
-<p>searches for all occurrences of "hello" in v2.5.</p>\r
-<p>If you leave out the commit name, git grep will search any of the\r
-files it manages in your current directory. So</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git grep "hello"</tt></pre>\r
-</div></div>\r
-<p>is a quick way to search just the files that are tracked by git.</p>\r
-<p>Many git commands also take sets of commits, which can be specified\r
-in a number of ways. Here are some examples with git log:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git log v2.5..v2.6 # commits between v2.5 and v2.6\r
-$ git log v2.5.. # commits since v2.5\r
-$ git log --since="2 weeks ago" # commits from the last 2 weeks\r
-$ git log v2.5.. Makefile # commits since v2.5 which modify\r
- # Makefile</tt></pre>\r
-</div></div>\r
-<p>You can also give git log a "range" of commits where the first is not\r
-necessarily an ancestor of the second; for example, if the tips of\r
-the branches "stable-release" and "master" diverged from a common\r
-commit some time ago, then</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git log stable..experimental</tt></pre>\r
-</div></div>\r
-<p>will list commits made in the experimental branch but not in the\r
-stable branch, while</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git log experimental..stable</tt></pre>\r
-</div></div>\r
-<p>will show the list of commits made on the stable branch but not\r
-the experimental branch.</p>\r
-<p>The "git log" command has a weakness: it must present commits in a\r
-list. When the history has lines of development that diverged and\r
-then merged back together, the order in which "git log" presents\r
-those commits is meaningless.</p>\r
-<p>Most projects with multiple contributors (such as the linux kernel,\r
-or git itself) have frequent merges, and gitk does a better job of\r
-visualizing their history. For example,</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ gitk --since="2 weeks ago" drivers/</tt></pre>\r
-</div></div>\r
-<p>allows you to browse any commits from the last 2 weeks of commits\r
-that modified files under the "drivers" directory. (Note: you can\r
-adjust gitk's fonts by holding down the control key while pressing\r
-"-" or "+".)</p>\r
-<p>Finally, most commands that take filenames will optionally allow you\r
-to precede any filename by a commit, to specify a particular version\r
-of the file:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git diff v2.5:Makefile HEAD:Makefile.in</tt></pre>\r
-</div></div>\r
-<p>You can also use "git show" to see any such file:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>$ git show v2.5:Makefile</tt></pre>\r
-</div></div>\r
-</div>\r
-<h2>Next Steps</h2>\r
-<div class="sectionbody">\r
-<p>This tutorial should be enough to perform basic distributed revision\r
-control for your projects. However, to fully understand the depth\r
-and power of git you need to understand two simple ideas on which it\r
-is based:</p>\r
-<ul>\r
-<li>\r
-<p>\r
-The object database is the rather elegant system used to\r
- store the history of your project—files, directories, and\r
- commits.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-The index file is a cache of the state of a directory tree,\r
- used to create commits, check out working directories, and\r
- hold the various trees involved in a merge.\r
-</p>\r
-</li>\r
-</ul>\r
-<p><a href="tutorial-2.html">Part two of this tutorial</a> explains the object\r
-database, the index file, and a few other odds and ends that you'll\r
-need to make the most of git.</p>\r
-<p>If you don't want to continue with that right away, a few other\r
-digressions that may be interesting at this point are:</p>\r
-<ul>\r
-<li>\r
-<p>\r
-<a href="git-format-patch.html">git-format-patch(1)</a>, <a href="git-am.html">git-am(1)</a>: These convert\r
- series of git commits into emailed patches, and vice versa,\r
- useful for projects such as the linux kernel which rely heavily\r
- on emailed patches.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-<a href="git-bisect.html">git-bisect(1)</a>: When there is a regression in your\r
- project, one way to track down the bug is by searching through\r
- the history to find the exact commit that's to blame. Git bisect\r
- can help you perform a binary search for that commit. It is\r
- smart enough to perform a close-to-optimal search even in the\r
- case of complex non-linear history with lots of merged branches.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-<a href="everyday.html">Everyday GIT with 20 Commands Or So</a>\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-<a href="cvs-migration.html">git for CVS users</a>.\r
-</p>\r
-</li>\r
-</ul>\r
-</div>\r
-<div id="footer">\r
-<div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:01 UTC\r
-</div>\r
-</div>\r
-</body>\r
-</html>\r
include::urls.txt[]
-REMOTES
--------
+REMOTES[[REMOTES]]
+------------------
-In addition to the above, as a short-hand, the name of a
-file in `$GIT_DIR/remotes` directory can be given; the
-named file should be in the following format:
+The name of one of the following can be used instead
+of a URL as `<repository>` argument:
-------------
- URL: one of the above URL format
- Push: <refspec>
- Pull: <refspec>
+* a remote in the git configuration file: `$GIT_DIR/config`,
+* a file in the `$GIT_DIR/remotes` directory, or
+* a file in the `$GIT_DIR/branches` directory.
-------------
+All of these also allow you to omit the refspec from the command line
+because they each contain a refspec which git will use by default.
-Then such a short-hand is specified in place of
-<repository> without <refspec> parameters on the command
-line, <refspec> specified on `Push:` lines or `Pull:`
-lines are used for `git-push` and `git-fetch`/`git-pull`,
-respectively. Multiple `Push:` and `Pull:` lines may
-be specified for additional branch mappings.
+Named remote in configuration file
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Or, equivalently, in the `$GIT_DIR/config` (note the use
-of `fetch` instead of `Pull:`):
+You can choose to provide the name of a remote which you had previously
+configured using linkgit:git-remote[1], linkgit:git-config[1]
+or even by a manual edit to the `$GIT_DIR/config` file. The URL of
+this remote will be used to access the repository. The refspec
+of this remote will be used by default when you do
+not provide a refspec on the command line. The entry in the
+config file would appear like this:
------------
- [remote "<remote>"]
+ [remote "<name>"]
url = <url>
push = <refspec>
fetch = <refspec>
-
------------
-The name of a file in `$GIT_DIR/branches` directory can be
-specified as an older notation short-hand; the named
-file should contain a single line, a URL in one of the
-above formats, optionally followed by a hash `#` and the
-name of remote head (URL fragment notation).
-`$GIT_DIR/branches/<remote>` file that stores a <url>
-without the fragment is equivalent to have this in the
-corresponding file in the `$GIT_DIR/remotes/` directory.
+
+Named file in `$GIT_DIR/remotes`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can choose to provide the name of a
+file in `$GIT_DIR/remotes`. The URL
+in this file will be used to access the repository. The refspec
+in this file will be used as default when you do not
+provide a refspec on the command line. This file should have the
+following format:
+
+------------
+ URL: one of the above URL format
+ Push: <refspec>
+ Pull: <refspec>
------------
- URL: <url>
- Pull: refs/heads/master:<remote>
+`Push:` lines are used by `git-push` and
+`Pull:` lines are used by `git-pull` and `git-fetch`.
+Multiple `Push:` and `Pull:` lines may
+be specified for additional branch mappings.
+
+Named file in `$GIT_DIR/branches`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can choose to provide the name of a
+file in `$GIT_DIR/branches`.
+The URL in this file will be used to access the repository.
+This file should have the following format:
+
+
+------------
+ <url>#<head>
------------
-while having `<url>#<head>` is equivalent to
+`<url>` is required; `#<head>` is optional.
+When you do not provide a refspec on the command line,
+git will use the following refspec, where `<head>` defaults to `master`,
+and `<repository>` is the name of this file
+you provided in the command line.
------------
- URL: <url>
- Pull: refs/heads/<head>:<remote>
+ refs/heads/<head>:<repository>
------------
+
+
+
+
projects / git.git / commitdiff