</p>\r
</dd>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:20 UTC\r
+Last updated 05-May-2006 23:14:10 UTC\r
</div>\r
</div>\r
</body>\r
-v::
Be verbose.
---::
+\--::
This option can be used to separate command-line options from
the list of files, (useful when filenames might be mistaken
for command-line options).
</p>\r
</dd>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Mar-2006 05:16:20 UTC\r
+Last updated 05-May-2006 23:14:10 UTC\r
</div>\r
</div>\r
</body>\r
Only meaningful with `--stdin`; paths are separated with
NUL character instead of LF.
---::
+\--::
Do not interpret any more arguments as options.
The order of the flags used to matter, but not anymore.
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Each commit between the fork-point and <head> is examined, and compared against\r
-the change each commit between the fork-point and <upstream> introduces.\r
-Commits already included in upstream are prefixed with <em>-</em> (meaning "drop from\r
-my local pull"), while commits missing from upstream are prefixed with <em>+</em>\r
-(meaning "add to the updated upstream").</p>\r
+<p>The changeset (or "diff") of each commit between the fork-point and <head>\r
+is compared against each commit between the fork-point and <upstream>.</p>\r
+<p>Every commit with a changeset that doesn't exist in the other branch\r
+has its id (sha1) reported, prefixed by a symbol. Those existing only\r
+in the <upstream> branch are prefixed with a minus (-) sign, and those\r
+that only exist in the <head> branch are prefixed with a plus (+) symbol.</p>\r
+<p>Because git-cherry compares the changeset rather than the commit id\r
+(sha1), you can use git-cherry to find out if a commit you made locally\r
+has been applied <upstream> under a different commit id. For example,\r
+this will happen if you're feeding patches <upstream> via email rather\r
+than pushing or pulling commits directly.</p>\r
</div>\r
<h2>OPTIONS</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:22 UTC\r
+Last updated 05-May-2006 23:14:11 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
-Each commit between the fork-point and <head> is examined, and compared against
-the change each commit between the fork-point and <upstream> introduces.
-Commits already included in upstream are prefixed with '-' (meaning "drop from
-my local pull"), while commits missing from upstream are prefixed with '+'
-(meaning "add to the updated upstream").
+The changeset (or "diff") of each commit between the fork-point and <head>
+is compared against each commit between the fork-point and <upstream>.
+
+Every commit with a changeset that doesn't exist in the other branch
+has its id (sha1) reported, prefixed by a symbol. Those existing only
+in the <upstream> branch are prefixed with a minus (-) sign, and those
+that only exist in the <head> branch are prefixed with a plus (+) symbol.
+
+Because git-cherry compares the changeset rather than the commit id
+(sha1), you can use git-cherry to find out if a commit you made locally
+has been applied <upstream> under a different commit id. For example,
+this will happen if you're feeding patches <upstream> via email rather
+than pushing or pulling commits directly.
+
OPTIONS
-------
</p>\r
</dd>\r
</dl>\r
-<h3>Examples</h3>\r
+</div>\r
+<h2>Examples</h2>\r
+<div class="sectionbody">\r
<dl>\r
<dt>\r
Clone from upstream\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Apr-2006 09:44:08 UTC\r
+Last updated 05-May-2006 23:14:11 UTC\r
</div>\r
</div>\r
</body>\r
is not allowed.
Examples
-~~~~~~~~
+--------
Clone from upstream::
+
</p>\r
</dd>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Apr-2006 23:07:59 UTC\r
+Last updated 05-May-2006 23:14:12 UTC\r
</div>\r
</div>\r
</body>\r
index and the latest commit does not match on the
specified paths to avoid confusion.
---::
+\--::
Do not interpret any more arguments as options.
<file>...::
configuration file (shown with examples):</p>\r
<div class="literalblock">\r
<div class="content">\r
-<pre><tt>Folder = "INBOX.Drafts"</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null"</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>Host = imap.server.com\r
-User = bob\r
-Password = pwd\r
-Port = 143</tt></pre>\r
+<pre><tt>[imap]\r
+ Folder = "INBOX.Drafts"\r
+\r
+[imap]\r
+ Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null"\r
+\r
+[imap]\r
+ Host = imap.server.com\r
+ User = bob\r
+ Pass = pwd\r
+ Port = 143</tt></pre>\r
</div></div>\r
</div>\r
<h2>BUGS</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Apr-2006 23:15:34 UTC\r
+Last updated 05-May-2006 23:14:12 UTC\r
</div>\r
</div>\r
</body>\r
git-imap-send requires the following values in the repository
configuration file (shown with examples):
+..........................
[imap]
Folder = "INBOX.Drafts"
[imap]
Host = imap.server.com
User = bob
- Password = pwd
+ Pass = pwd
Port = 143
+..........................
BUGS
</p>\r
</dd>\r
<dt>\r
-git log --since="2 weeks ago" — gitk\r
+git log --since="2 weeks ago" -- gitk\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-Apr-2006 07:01:34 UTC\r
+Last updated 05-May-2006 23:14:12 UTC\r
</div>\r
</div>\r
</body>\r
Show all commits since version 'v2.6.12' that changed any file
in the include/scsi or drivers/scsi subdirectories
-git log --since="2 weeks ago" -- gitk::
+git log --since="2 weeks ago" \-- gitk::
Show the changes during the last two weeks to the file 'gitk'.
The "--" is necessary to avoid confusion with the *branch* named
</p>\r
</dd>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 28-Mar-2006 00:27:56 UTC\r
+Last updated 05-May-2006 23:14:13 UTC\r
</div>\r
</div>\r
</body>\r
lines, show only handful hexdigits prefix.
Non default number of digits can be specified with --abbrev=<n>.
---::
+\--::
Do not interpret any more arguments as options.
<file>::
<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.1" />\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
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | — | <file>*)</p>\r
+<p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | -- | <file>*)</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
<div class="sectionbody">\r
<dl>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:20 PDT\r
+Last updated 05-May-2006 23:14:13 UTC\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
+'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*)
DESCRIPTION
-----------
OPTIONS
-------
---::
+\--::
Do not interpret any more arguments as options.
-a::
<p>Enter git-name-rev:</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a</tt></pre>\r
+<pre><tt>% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a\r
+33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940</tt></pre>\r
</div></div>\r
<p>Now you are wiser, because you know that it happened 940 revisions before v0.99.</p>\r
<p>Another nice thing you can do is:</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:29 UTC\r
+Last updated 05-May-2006 23:14:14 UTC\r
</div>\r
</div>\r
</body>\r
------------
% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a
+33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940
------------
Now you are wiser, because you know that it happened 940 revisions before v0.99.
<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.1" />\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
</p>\r
</dd>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:28 PDT\r
+Last updated 05-May-2006 23:14:14 UTC\r
</div>\r
</div>\r
</body>\r
Do not remove anything; just report what it would
remove.
---::
+\--::
Do not interpret any more arguments as options.
<head>...::
<p>\r
After packing, if the newly created packs make some\r
existing packs redundant, remove the redundant packs.\r
+ Also runs <a href="git-prune-packed.html">git-prune-packed(1)</a>.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Mar-2006 09:02:49 UTC\r
+Last updated 05-May-2006 23:14:14 UTC\r
</div>\r
</div>\r
</body>\r
-d::
After packing, if the newly created packs make some
existing packs redundant, remove the redundant packs.
+ Also runs gitlink:git-prune-packed[1].
-l::
Pass the `--local` option to `git pack-objects`, see
convert the value to the canonical form (simple decimal number for int,\r
a "true" or "false" string for bool). If no type specifier is passed,\r
no checks or transformations are performed on the value.</p>\r
-<p>This command will fail if</p>\r
+<p>This command will fail if:</p>\r
<ol>\r
<li>\r
<p>\r
-.git/config is invalid,\r
+The .git/config file is invalid,\r
</p>\r
</li>\r
<li>\r
<p>\r
-.git/config can not be written to,\r
+Can not write to .git/config,\r
</p>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-May-2006 08:01:37 UTC\r
+Last updated 05-May-2006 23:14:15 UTC\r
</div>\r
</div>\r
</body>\r
a "true" or "false" string for bool). If no type specifier is passed,
no checks or transformations are performed on the value.
-This command will fail if
+This command will fail if:
-. .git/config is invalid,
-. .git/config can not be written to,
+. The .git/config file is invalid,
+. Can not write to .git/config,
. no section was provided,
. the section or key is invalid,
. you try to unset an option which does not exist, or
</p>\r
</dd>\r
</dl>\r
-<h3>Examples</h3>\r
+</div>\r
+<h2>Examples</h2>\r
+<div class="sectionbody">\r
<dl>\r
<dt>\r
Undo a commit and redo\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-Apr-2006 07:01:34 UTC\r
+Last updated 05-May-2006 23:14:15 UTC\r
</div>\r
</div>\r
</body>\r
Commit to make the current HEAD.
Examples
-~~~~~~~~
+--------
Undo a commit and redo::
+
</p>\r
</dd>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:35 UTC\r
+Last updated 05-May-2006 23:14:16 UTC\r
</div>\r
</div>\r
</body>\r
-v::
Be verbose.
---::
+\--::
This option can be used to separate command-line options from
the list of files, (useful when filenames might be mistaken
for command-line options).
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Reads a packed archive (.pack) from the standard input, and\r
-expands the objects contained in the pack into "one-file\r
-one-object" format in $GIT_OBJECT_DIRECTORY.</p>\r
+<p>Read a packed archive (.pack) from the standard input, expanding\r
+the objects contained within and writing them into the repository in\r
+"loose" (one object per file) format.</p>\r
+<p>Objects that already exist in the repository will <strong>not</strong> be unpacked\r
+from the pack-file. Therefore, nothing will be unpacked if you use\r
+this command on a pack-file that exists within the target repository.</p>\r
+<p>Please see the <tt>git-repack</tt> documentation for options to generate\r
+new packs and replace existing ones.</p>\r
</div>\r
<h2>OPTIONS</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:38 UTC\r
+Last updated 05-May-2006 23:14:16 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
-Reads a packed archive (.pack) from the standard input, and
-expands the objects contained in the pack into "one-file
-one-object" format in $GIT_OBJECT_DIRECTORY.
+Read a packed archive (.pack) from the standard input, expanding
+the objects contained within and writing them into the repository in
+"loose" (one object per file) format.
+
+Objects that already exist in the repository will *not* be unpacked
+from the pack-file. Therefore, nothing will be unpacked if you use
+this command on a pack-file that exists within the target repository.
+
+Please see the `git-repack` documentation for options to generate
+new packs and replace existing ones.
OPTIONS
-------
</p>\r
</dd>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-May-2006 00:46:26 UTC\r
+Last updated 05-May-2006 23:14:17 UTC\r
</div>\r
</div>\r
</body>\r
Only meaningful with `--stdin`; paths are separated with
NUL character instead of LF.
---::
+\--::
Do not interpret any more arguments as options.
<file>::
</p>\r
</dd>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:38 UTC\r
+Last updated 05-May-2006 23:14:17 UTC\r
</div>\r
</div>\r
</body>\r
-v::
After verifying the pack, show list of objects contained
in the pack.
---::
+\--::
Do not interpret any more arguments as options.
OUTPUT FORMAT
</p>\r
</dd>\r
<dt>\r
-git-whatchanged --since="2 weeks ago" — gitk\r
+git-whatchanged --since="2 weeks ago" -- gitk\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Mar-2006 08:11:02 UTC\r
+Last updated 05-May-2006 23:14:17 UTC\r
</div>\r
</div>\r
</body>\r
Show as patches the commits since version 'v2.6.12' that changed
any file in the include/scsi or drivers/scsi subdirectories
-git-whatchanged --since="2 weeks ago" -- gitk::
+git-whatchanged --since="2 weeks ago" \-- gitk::
Show the changes during the last two weeks to the file 'gitk'.
The "--" is necessary to avoid confusion with the *branch* named
<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.1" />\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
</p>\r
</dd>\r
<dt>\r
-gitk --since="2 weeks ago" — gitk\r
+gitk --since="2 weeks ago" -- gitk\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:58 PDT\r
+Last updated 05-May-2006 23:14:18 UTC\r
</div>\r
</div>\r
</body>\r
Show as the changes since version 'v2.6.12' that changed any
file in the include/scsi or drivers/scsi subdirectories
-gitk --since="2 weeks ago" -- gitk::
+gitk --since="2 weeks ago" \-- gitk::
Show the changes during the last two weeks to the file 'gitk'.
The "--" is necessary to avoid confusion with the *branch* named
projects / git.git / commitdiff