Autogenerated HTML docs for v1.5.4.3-484-g60e3

diff --git a/config.txt b/config.txt
index 4027726f2ee66ebad69412a5c8c6d1aef7f7463f..c5e094a9c4a31568e4efb2c70af7e7808ae63528 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -556,6 +556,11 @@ format.suffix::
        `.patch`. Use this variable to change that suffix (make sure to
        include the dot if you want it).
 
+format.pretty::
+       The default pretty format for log/show/whatchanged command,
+       See linkgit:git-log[1], linkgit:git-show[1],
+       linkgit:git-whatchanged[1].
+
 gc.aggressiveWindow::
        The window size parameter used in the delta compression
        algorithm used by 'git gc --aggressive'.  This defaults
@@ -749,8 +754,10 @@ merge.summary::
 
 merge.tool::
        Controls which merge resolution program is used by
-       linkgit:git-mergetool[1].  Valid values are: "kdiff3", "tkdiff",
-       "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
+       linkgit:git-mergetool[1].  Valid built-in values are: "kdiff3",
+       "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
+       "opendiff".  Any other value is treated is custom merge tool
+       and there must be a corresponing mergetool.<tool>.cmd option.
 
 merge.verbosity::
        Controls the amount of output shown by the recursive merge
@@ -777,6 +784,31 @@ mergetool.<tool>.path::
        Override the path for the given tool.  This is useful in case
        your tool is not in the PATH.
 
+mergetool.<tool>.cmd::
+       Specify the command to invoke the specified merge tool.  The
+       specified command is evaluated in shell with the following
+       variables available: 'BASE' is the name of a temporary file
+       containing the common base of the files to be merged, if available;
+       'LOCAL' is the name of a temporary file containing the contents of
+       the file on the current branch; 'REMOTE' is the name of a temporary
+       file containing the contents of the file from the branch being
+       merged; 'MERGED' contains the name of the file to which the merge
+       tool should write the results of a successful merge.
+
+mergetool.<tool>.trustExitCode::
+       For a custom merge command, specify whether the exit code of
+       the merge command can be used to determine whether the merge was
+       successful.  If this is not set to true then the merge target file
+       timestamp is checked and the merge assumed to have been successful
+       if the file has been updated, otherwise the user is prompted to
+       indicate the success of the merge.
+
+mergetool.keepBackup::
+       After performing a merge, the original file with conflict markers
+       can be saved as a file with a `.orig` extension.  If this variable
+       is set to `false` then this file is not preserved.  Defaults to
+       `true` (i.e. keep the backup files).
+
 pack.window::
        The size of the window used by linkgit:git-pack-objects[1] when no
        window size is given on the command line. Defaults to 10.
@@ -864,15 +896,15 @@ remote.<name>.skipDefaultUpdate::
 
 remote.<name>.receivepack::
        The default program to execute on the remote side when pushing.  See
-       option \--exec of linkgit:git-push[1].
+       option \--receive-pack of linkgit:git-push[1].
 
 remote.<name>.uploadpack::
        The default program to execute on the remote side when fetching.  See
-       option \--exec of linkgit:git-fetch-pack[1].
+       option \--upload-pack of linkgit:git-fetch-pack[1].
 
 remote.<name>.tagopt::
-       Setting this value to --no-tags disables automatic tag following when fetching
-       from remote <name>
+       Setting this value to \--no-tags disables automatic tag following when
+       fetching from remote <name>
 
 remotes.<group>::
        The list of remotes which are fetched by "git remote update

diff --git a/git-config.html b/git-config.html
index e39570eb778de1fcc92e2af0fe48af1d9ac5b3e2..9be8b83cd1b8b66d16893c07d8ddcc2288767b33 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1507,6 +1507,16 @@ format.suffix
 </p>\r
 </dd>\r
 <dt>\r
+format.pretty\r
+</dt>\r
+<dd>\r
+<p>\r
+        The default pretty format for log/show/whatchanged command,\r
+        See <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>,\r
+        <a href="git-whatchanged.html">git-whatchanged(1)</a>.\r
+</p>\r
+</dd>\r
+<dt>\r
 gc.aggressiveWindow\r
 </dt>\r
 <dd>\r
@@ -1879,8 +1889,10 @@ merge.tool
 <dd>\r
 <p>\r
         Controls which merge resolution program is used by\r
-        <a href="git-mergetool.html">git-mergetool(1)</a>.  Valid values are: "kdiff3", "tkdiff",\r
-        "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".\r
+        <a href="git-mergetool.html">git-mergetool(1)</a>.  Valid built-in values are: "kdiff3",\r
+        "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and\r
+        "opendiff".  Any other value is treated is custom merge tool\r
+        and there must be a corresponing mergetool.&lt;tool&gt;.cmd option.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1934,6 +1946,46 @@ mergetool.&lt;tool&gt;.path
 </p>\r
 </dd>\r
 <dt>\r
+mergetool.&lt;tool&gt;.cmd\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specify the command to invoke the specified merge tool.  The\r
+        specified command is evaluated in shell with the following\r
+        variables available: <em>BASE</em> is the name of a temporary file\r
+        containing the common base of the files to be merged, if available;\r
+        <em>LOCAL</em> is the name of a temporary file containing the contents of\r
+        the file on the current branch; <em>REMOTE</em> is the name of a temporary\r
+        file containing the contents of the file from the branch being\r
+        merged; <em>MERGED</em> contains the name of the file to which the merge\r
+        tool should write the results of a successful merge.\r
+</p>\r
+</dd>\r
+<dt>\r
+mergetool.&lt;tool&gt;.trustExitCode\r
+</dt>\r
+<dd>\r
+<p>\r
+        For a custom merge command, specify whether the exit code of\r
+        the merge command can be used to determine whether the merge was\r
+        successful.  If this is not set to true then the merge target file\r
+        timestamp is checked and the merge assumed to have been successful\r
+        if the file has been updated, otherwise the user is prompted to\r
+        indicate the success of the merge.\r
+</p>\r
+</dd>\r
+<dt>\r
+mergetool.keepBackup\r
+</dt>\r
+<dd>\r
+<p>\r
+        After performing a merge, the original file with conflict markers\r
+        can be saved as a file with a <tt>.orig</tt> extension.  If this variable\r
+        is set to <tt>false</tt> then this file is not preserved.  Defaults to\r
+        <tt>true</tt> (i.e. keep the backup files).\r
+</p>\r
+</dd>\r
+<dt>\r
 pack.window\r
 </dt>\r
 <dd>\r
@@ -2100,7 +2152,7 @@ remote.&lt;name&gt;.receivepack
 <dd>\r
 <p>\r
         The default program to execute on the remote side when pushing.  See\r
-        option --exec of <a href="git-push.html">git-push(1)</a>.\r
+        option --receive-pack of <a href="git-push.html">git-push(1)</a>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2109,7 +2161,7 @@ remote.&lt;name&gt;.uploadpack
 <dd>\r
 <p>\r
         The default program to execute on the remote side when fetching.  See\r
-        option --exec of <a href="git-fetch-pack.html">git-fetch-pack(1)</a>.\r
+        option --upload-pack of <a href="git-fetch-pack.html">git-fetch-pack(1)</a>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2117,8 +2169,8 @@ remote.&lt;name&gt;.tagopt
 </dt>\r
 <dd>\r
 <p>\r
-        Setting this value to --no-tags disables automatic tag following when fetching\r
-        from remote &lt;name&gt;\r
+        Setting this value to --no-tags disables automatic tag following when\r
+        fetching from remote &lt;name&gt;\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2308,7 +2360,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Mar-2008 12:05:57 UTC\r
+Last updated 08-Mar-2008 09:29:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 053b7dbf140871630eba1ce01aa2ad9fae2c2071..bff915567ae90d8fc934a720cdcc726c398e00eb 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -841,6 +841,8 @@ separated with a single space are given.</p>
         <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.\r
         When omitted, the format defaults to <em>medium</em>.\r
 </p>\r
+<p>Note: you can specify the default pretty format in the repository\r
+configuration (see <a href="git-config.html">git-config(1)</a>).</p>\r
 </dd>\r
 <dt>\r
 --abbrev-commit\r
@@ -1744,7 +1746,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Feb-2008 00:25:39 UTC\r
+Last updated 08-Mar-2008 09:29:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index eb1872eaf1b1dd2339b4b176b383d0f7c1db2721..949eb15993003e636b446696519531551020b6a3 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -820,6 +820,8 @@ each commit introduces are shown.</p>
         <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.\r
         When omitted, the format defaults to <em>medium</em>.\r
 </p>\r
+<p>Note: you can specify the default pretty format in the repository\r
+configuration (see <a href="git-config.html">git-config(1)</a>).</p>\r
 </dd>\r
 <dt>\r
 --abbrev-commit\r
@@ -1908,7 +1910,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Mar-2008 01:59:58 UTC\r
+Last updated 08-Mar-2008 09:29:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reflog.html b/git-reflog.html
index 5564b5ba4e45734a257fe3218421719e883d72a3..01a1ecb1b89f72bbfb3d72c15c5d6ef88c8dde37 100644 (file)
--- a/git-reflog.html
+++ b/git-reflog.html
@@ -281,6 +281,7 @@ depending on the subcommand:</p>
 <div class="verseblock">\r
 <div class="content">git reflog expire [--dry-run] [--stale-fix] [--verbose]\r
         [--expire=&lt;time&gt;] [--expire-unreachable=&lt;time&gt;] [--all] &lt;refs&gt;&#8230;</div></div>\r
+<p>git reflog delete ref@{specifier}&#8230;</p>\r
 <p>git reflog [show] [log-options] [&lt;ref&gt;]</p>\r
 <p>Reflog is a mechanism to record when the tip of branches are\r
 updated.  This command is to manage the information recorded in it.</p>\r
@@ -300,6 +301,8 @@ of a reference. For example, <tt>HEAD@{2}</tt> means "where HEAD used to be
 two moves ago", <tt>master@{one.week.ago}</tt> means "where master used to\r
 point to one week ago", and so on. See <a href="git-rev-parse.html">git-rev-parse(1)</a> for\r
 more details.</p>\r
+<p>To delete single entries from the reflog, use the subcommand "delete"\r
+and specify the _exact_ entry (e.g. &#8220;git reflog delete master@{2}&#8221;).</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -352,6 +355,25 @@ them.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--updateref\r
+</dt>\r
+<dd>\r
+<p>\r
+        Update the ref with the sha1 of the top reflog entry (i.e.\r
+        &lt;ref&gt;@{0}) after expiring or deleting.\r
+</p>\r
+</dd>\r
+<dt>\r
+--rewrite\r
+</dt>\r
+<dd>\r
+<p>\r
+        While expiring or deleting, adjust each reflog entry to ensure\r
+        that the <tt>old</tt> sha1 field points to the <tt>new</tt> sha1 field of the\r
+        previous entry.\r
+</p>\r
+</dd>\r
+<dt>\r
 --verbose\r
 </dt>\r
 <dd>\r
@@ -375,7 +397,7 @@ them.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:40 UTC\r
+Last updated 08-Mar-2008 09:29:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reflog.txt b/git-reflog.txt
index f9bba36c2309d5b4a9587d0f4a406cf57fcd8348..047e3ce14dfac6f1848fa8f1772202c26efa1055 100644 (file)
--- a/git-reflog.txt
+++ b/git-reflog.txt
@@ -19,6 +19,8 @@ depending on the subcommand:
 git reflog expire [--dry-run] [--stale-fix] [--verbose]
        [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...
 
+git reflog delete ref@\{specifier\}...
+
 git reflog [show] [log-options] [<ref>]
 
 Reflog is a mechanism to record when the tip of branches are
@@ -43,6 +45,9 @@ two moves ago", `master@\{one.week.ago\}` means "where master used to
 point to one week ago", and so on. See linkgit:git-rev-parse[1] for
 more details.
 
+To delete single entries from the reflog, use the subcommand "delete"
+and specify the _exact_ entry (e.g. ``git reflog delete master@\{2\}'').
+
 
 OPTIONS
 -------
@@ -75,6 +80,15 @@ them.
 --all::
        Instead of listing <refs> explicitly, prune all refs.
 
+--updateref::
+       Update the ref with the sha1 of the top reflog entry (i.e.
+       <ref>@\{0\}) after expiring or deleting.
+
+--rewrite::
+       While expiring or deleting, adjust each reflog entry to ensure
+       that the `old` sha1 field points to the `new` sha1 field of the
+       previous entry.
+
 --verbose::
        Print extra information on screen.
 

diff --git a/git-rev-list.html b/git-rev-list.html
index 419a03a05f730e5294fc32f4db41f424841a5b5d..24ac9fcff8aceed3c84f16f477dc45b6f2273a6c 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -364,6 +364,8 @@ more specialized family of commit log tools: <a href="git-log.html">git-log(1)</
         <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.\r
         When omitted, the format defaults to <em>medium</em>.\r
 </p>\r
+<p>Note: you can specify the default pretty format in the repository\r
+configuration (see <a href="git-config.html">git-config(1)</a>).</p>\r
 </dd>\r
 <dt>\r
 --abbrev-commit\r
@@ -1204,7 +1206,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Mar-2008 01:59:59 UTC\r
+Last updated 08-Mar-2008 09:30:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show.html b/git-show.html
index f2a1a2fbaa93686a714ecf8a10bf7d84c48d1c84..3673c0814292b3041fbe420f29438d0a44f0007b 100644 (file)
--- a/git-show.html
+++ b/git-show.html
@@ -311,6 +311,8 @@ control how the changes the commit introduces are shown.</p>
         <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.\r
         When omitted, the format defaults to <em>medium</em>.\r
 </p>\r
+<p>Note: you can specify the default pretty format in the repository\r
+configuration (see <a href="git-config.html">git-config(1)</a>).</p>\r
 </dd>\r
 <dt>\r
 --abbrev-commit\r
@@ -762,7 +764,7 @@ Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:48 UTC\r
+Last updated 08-Mar-2008 09:30:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-stash.html b/git-stash.html
index 0300f0c60d62caea91133b0d2f7c6fb59721985a..bd6adae9f56516b9a27e82bb4d862f399b0882ec 100644 (file)
--- a/git-stash.html
+++ b/git-stash.html
@@ -273,7 +273,7 @@ git-stash(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-stash</em> (list | show [&lt;stash&gt;] | apply [&lt;stash&gt;] | clear)\r
+<div class="content"><em>git-stash</em> (list | show [&lt;stash&gt;] | apply [&lt;stash&gt;] | clear | drop [&lt;stash&gt;] | pop [&lt;stash&gt;])\r
 <em>git-stash</em> [save [&lt;message&gt;]]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -365,6 +365,25 @@ clear
         be subject to pruning, and may be difficult or impossible to recover.\r
 </p>\r
 </dd>\r
+<dt>\r
+drop [&lt;stash&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        Remove a single stashed state from the stash list. When no <tt>&lt;stash&gt;</tt>\r
+        is given, it removes the latest one. i.e. <tt>stash@{0}</tt>\r
+</p>\r
+</dd>\r
+<dt>\r
+pop [&lt;stash&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        Remove a single stashed state from the stash list and apply on top\r
+        of the current working tree state. When no <tt>&lt;stash&gt;</tt> is given,\r
+        <tt>stash@{0}</tt> is assumed. See also <tt>apply</tt>.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>DISCUSSION</h2>\r
@@ -463,7 +482,7 @@ $ git stash apply
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Feb-2008 02:29:24 UTC\r
+Last updated 08-Mar-2008 09:30:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-stash.txt b/git-stash.txt
index 48e6f5a3f7a85e886639381dfa70434ecdeccfc2..8dc35d493e81bc0c5515ec279dbe95c464c57469 100644 (file)
--- a/git-stash.txt
+++ b/git-stash.txt
@@ -8,7 +8,7 @@ git-stash - Stash the changes in a dirty working directory away
 SYNOPSIS
 --------
 [verse]
-'git-stash' (list | show [<stash>] | apply [<stash>] | clear)
+'git-stash' (list | show [<stash>] | apply [<stash>] | clear | drop [<stash>] | pop [<stash>])
 'git-stash' [save [<message>]]
 
 DESCRIPTION
@@ -85,6 +85,17 @@ clear::
        Remove all the stashed states. Note that those states will then
        be subject to pruning, and may be difficult or impossible to recover.
 
+drop [<stash>]::
+
+       Remove a single stashed state from the stash list. When no `<stash>`
+       is given, it removes the latest one. i.e. `stash@\{0}`
+
+pop [<stash>]::
+
+       Remove a single stashed state from the stash list and apply on top
+       of the current working tree state. When no `<stash>` is given,
+       `stash@\{0}` is assumed. See also `apply`.
+
 
 DISCUSSION
 ----------

diff --git a/git-whatchanged.html b/git-whatchanged.html
index 58e3ee6d079ab1c64a7f37e90654e1eaa33a7fdd..81c3686680948a739f99b3cbeb758c13941305fc 100644 (file)
--- a/git-whatchanged.html
+++ b/git-whatchanged.html
@@ -322,16 +322,6 @@ these commands.</p>
 </p>\r
 </dd>\r
 <dt>\r
---pretty=&lt;format&gt;\r
-</dt>\r
-<dd>\r
-<p>\r
-        Controls the output format for the commit logs.\r
-        &lt;format&gt; can be one of <em>raw</em>, <em>medium</em>, <em>short</em>, <em>full</em>,\r
-        and <em>oneline</em>.\r
-</p>\r
-</dd>\r
-<dt>\r
 -m\r
 </dt>\r
 <dd>\r
@@ -343,8 +333,336 @@ these commands.</p>
 <p>However, it is not very useful in general, although it\r
 <strong>is</strong> useful on a file-by-file basis.</p>\r
 </dd>\r
+<dt>\r
+--pretty[=<em>&lt;format&gt;</em>]\r
+</dt>\r
+<dd>\r
+<p>\r
+        Pretty-print the contents of the commit logs in a given format,\r
+        where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,\r
+        <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.\r
+        When omitted, the format defaults to <em>medium</em>.\r
+</p>\r
+<p>Note: you can specify the default pretty format in the repository\r
+configuration (see <a href="git-config.html">git-config(1)</a>).</p>\r
+</dd>\r
+<dt>\r
+--abbrev-commit\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of showing the full 40-byte hexadecimal commit object\r
+        name, show only handful hexdigits prefix.  Non default number of\r
+        digits can be specified with "--abbrev=&lt;n&gt;" (which also modifies\r
+        diff output, if it is displayed).\r
+</p>\r
+<p>This should make "--pretty=oneline" a whole lot more readable for\r
+people using 80-column terminals.</p>\r
+</dd>\r
+<dt>\r
+--encoding[=&lt;encoding&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        The commit objects record the encoding used for the log message\r
+        in their encoding header; this option can be used to tell the\r
+        command to re-code the commit log message in the encoding\r
+        preferred by the user.  For non plumbing commands this\r
+        defaults to UTF-8.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
+<h2>PRETTY FORMATS</h2>\r
+<div class="sectionbody">\r
+<p>If the commit is a merge, and if the pretty-format\r
+is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is\r
+inserted before the <em>Author:</em> line.  This line begins with\r
+"Merge: " and the sha1s of ancestral commits are printed,\r
+separated by spaces.  Note that the listed commits may not\r
+necessarily be the list of the <strong>direct</strong> parent commits if you\r
+have limited your view of history: for example, if you are\r
+only interested in changes related to a certain directory or\r
+file.</p>\r
+<p>Here are some additional details for each format:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>oneline</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<p>This is designed to be as compact as possible.</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>short</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>medium</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Date: &lt;date&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>full</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Commit: &lt;committer&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>fuller</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+AuthorDate: &lt;date &amp; time&gt;\r
+Commit: &lt;committer&gt;\r
+CommitDate: &lt;date &amp; time&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>email</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>From &lt;sha1&gt; &lt;date&gt;\r
+From: &lt;author&gt;\r
+Date: &lt;date &amp; time&gt;\r
+Subject: [PATCH] &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>raw</em>\r
+</p>\r
+<p>The <em>raw</em> format shows the entire commit exactly as\r
+stored in the commit object.  Notably, the SHA1s are\r
+displayed in full, regardless of whether --abbrev or\r
+--no-abbrev are used, and <em>parents</em> information show the\r
+true parent commits, without taking grafts nor history\r
+simplification into account.</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>format:</em>\r
+</p>\r
+<p>The <em>format:</em> format allows you to specify which information\r
+you want to show. It works a little bit like printf format,\r
+with the notable exception that you get a newline with <em>%n</em>\r
+instead of <em>\n</em>.</p>\r
+<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was &gt;&gt;%s&lt;&lt;%n"</em>\r
+would show something like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago\r
+The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff input.&lt;&lt;\r
+</tt></pre>\r
+</div></div>\r
+<p>The placeholders are:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>%H</em>: commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%h</em>: abbreviated commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%T</em>: tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%t</em>: abbreviated tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%P</em>: parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%p</em>: abbreviated parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%an</em>: author name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ae</em>: author email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ad</em>: author date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%aD</em>: author date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ar</em>: author date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%at</em>: author date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ai</em>: author date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cn</em>: committer name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ce</em>: committer email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cd</em>: committer date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cD</em>: committer date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cr</em>: committer date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ct</em>: committer date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ci</em>: committer date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%e</em>: encoding\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%s</em>: subject\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%b</em>: body\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cred</em>: switch color to red\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cgreen</em>: switch color to green\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cblue</em>: switch color to blue\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Creset</em>: reset color\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%m</em>: left, right or boundary mark\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%n</em>: newline\r
+</p>\r
+</li>\r
+</ul>\r
+</li>\r
+</ul>\r
+</div>\r
 <h2>Examples</h2>\r
 <div class="sectionbody">\r
 <dl>\r
@@ -384,7 +702,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:58 UTC\r
+Last updated 08-Mar-2008 09:30:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-whatchanged.txt b/git-whatchanged.txt
index 54947b676969585c4641bf7a4f538623e059dd15..a6e7bd4c8b99ad2d6a19acf4a412b81580ef3027 100644 (file)
--- a/git-whatchanged.txt
+++ b/git-whatchanged.txt
@@ -38,11 +38,6 @@ OPTIONS
        Show git internal diff output, but for the whole tree,
        not just the top level.
 
---pretty=<format>::
-       Controls the output format for the commit logs.
-       <format> can be one of 'raw', 'medium', 'short', 'full',
-       and 'oneline'.
-
 -m::
        By default, differences for merge commits are not shown.
        With this flag, show differences to that commit from all
@@ -51,6 +46,10 @@ OPTIONS
 However, it is not very useful in general, although it
 *is* useful on a file-by-file basis.
 
+include::pretty-options.txt[]
+
+include::pretty-formats.txt[]
+
 Examples
 --------
 git-whatchanged -p v2.6.12.. include/scsi drivers/scsi::

diff --git a/pretty-options.txt b/pretty-options.txt
index 973d8dd733f954abf93aac7c68efef1154e9f315..6d66c74cc11e6622892061f8328d04dfe38f87bf 100644 (file)
--- a/pretty-options.txt
+++ b/pretty-options.txt
@@ -4,6 +4,9 @@
        where '<format>' can be one of 'oneline', 'short', 'medium',
        'full', 'fuller', 'email', 'raw' and 'format:<string>'.
        When omitted, the format defaults to 'medium'.
++
+Note: you can specify the default pretty format in the repository
+configuration (see linkgit:git-config[1]).
 
 --abbrev-commit::
        Instead of showing the full 40-byte hexadecimal commit object

diff --git a/technical/api-run-command.html b/technical/api-run-command.html
index 67e1b63ec3ef33c5d74fb0511d18127f877bb3a7..2c0c216795e8d5b9aa906bf0c19fee3d7e1af110 100644 (file)
--- a/technical/api-run-command.html
+++ b/technical/api-run-command.html
@@ -448,9 +448,10 @@ Special forms of redirection are available by setting these members
 </div></div>\r
 <div class="literalblock">\r
 <div class="content">\r
-<pre><tt>.stdout_to_stderr: stdout of the child is redirected to the\r
-        parent's stderr (i.e. *not* to what .err or\r
-        .no_stderr specify).</tt></pre>\r
+<pre><tt>.stdout_to_stderr: stdout of the child is redirected to its\r
+        stderr. This happens after stderr is itself redirected.\r
+        So stdout will follow stderr to wherever it is\r
+        redirected.</tt></pre>\r
 </div></div>\r
 </li>\r
 </ol>\r
@@ -563,7 +564,7 @@ It must not change the program's state that the caller of the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Mar-2008 02:00:01 UTC\r
+Last updated 08-Mar-2008 09:30:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/technical/api-run-command.txt b/technical/api-run-command.txt
index fde3b453211030b7256ccedd100970ef712338bd..c364a22c8f98f6fbb71d4059f7458ed0fa78ed43 100644 (file)
--- a/technical/api-run-command.txt
+++ b/technical/api-run-command.txt
@@ -111,9 +111,10 @@ stderr as follows:
        .no_stdin, .no_stdout, .no_stderr: The respective channel is
                redirected to /dev/null.
 
-       .stdout_to_stderr: stdout of the child is redirected to the
-               parent's stderr (i.e. *not* to what .err or
-               .no_stderr specify).
+       .stdout_to_stderr: stdout of the child is redirected to its
+               stderr. This happens after stderr is itself redirected.
+               So stdout will follow stderr to wherever it is
+               redirected.
 
 To modify the environment of the sub-process, specify an array of
 string pointers (NULL terminated) in .env: