Autogenerated HTML docs for v1.5.3.5-529-ge3d6d

diff --git a/core-tutorial.html b/core-tutorial.html
index 4618ffce77dca667877ff65a16d1fa53b0112b90..5c6766f766d52bc8da6993377487e606a7b3b960 100644 (file)
--- a/core-tutorial.html
+++ b/core-tutorial.html
@@ -1055,7 +1055,7 @@ that branch, and do some work there.</p>
 <div class="content">\r
 <pre><tt>$ git checkout mybranch\r
 $ echo "Work, work, work" &gt;&gt;hello\r
-$ git commit -m 'Some work.' -i hello</tt></pre>\r
+$ git commit -m "Some work." -i hello</tt></pre>\r
 </div></div>\r
 <p>Here, we just added another line to <tt>hello</tt>, and we used a shorthand for\r
 doing both <tt>git-update-index hello</tt> and <tt>git commit</tt> by just giving the\r
@@ -1077,7 +1077,7 @@ hasn't happened in the <tt>master</tt> branch at all. Then do</p>
 <div class="content">\r
 <pre><tt>$ echo "Play, play, play" &gt;&gt;hello\r
 $ echo "Lots of fun" &gt;&gt;example\r
-$ git commit -m 'Some fun.' -i hello example</tt></pre>\r
+$ git commit -m "Some fun." -i hello example</tt></pre>\r
 </div></div>\r
 <p>since the master branch is obviously in a much better mood.</p>\r
 <p>Now, you've got two branches, and you decide that you want to merge the\r
@@ -1885,8 +1885,8 @@ in both of them.  You could merge in <em>diff-fix</em> first and then
 <em>commit-fix</em> next, like this:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>$ git merge -m 'Merge fix in diff-fix' diff-fix\r
-$ git merge -m 'Merge fix in commit-fix' commit-fix</tt></pre>\r
+<pre><tt>$ git merge -m "Merge fix in diff-fix" diff-fix\r
+$ git merge -m "Merge fix in commit-fix" commit-fix</tt></pre>\r
 </div></div>\r
 <p>Which would result in:</p>\r
 <div class="listingblock">\r
@@ -1948,7 +1948,7 @@ to follow, not easier.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 31-Oct-2007 05:56:51 UTC\r
+Last updated 03-Nov-2007 02:45:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/core-tutorial.txt b/core-tutorial.txt
index 5df97a1f9d5633657e4aad05a39acbf0d09e4a58..99817c53375e6f58b7a3e089cd81e3af5aaffc79 100644 (file)
--- a/core-tutorial.txt
+++ b/core-tutorial.txt
@@ -828,7 +828,7 @@ that branch, and do some work there.
 ------------------------------------------------
 $ git checkout mybranch
 $ echo "Work, work, work" >>hello
-$ git commit -m 'Some work.' -i hello
+$ git commit -m "Some work." -i hello
 ------------------------------------------------
 
 Here, we just added another line to `hello`, and we used a shorthand for
@@ -853,7 +853,7 @@ hasn't happened in the `master` branch at all. Then do
 ------------
 $ echo "Play, play, play" >>hello
 $ echo "Lots of fun" >>example
-$ git commit -m 'Some fun.' -i hello example
+$ git commit -m "Some fun." -i hello example
 ------------
 
 since the master branch is obviously in a much better mood.
@@ -1607,8 +1607,8 @@ in both of them.  You could merge in 'diff-fix' first and then
 'commit-fix' next, like this:
 
 ------------
-$ git merge -m 'Merge fix in diff-fix' diff-fix
-$ git merge -m 'Merge fix in commit-fix' commit-fix
+$ git merge -m "Merge fix in diff-fix" diff-fix
+$ git merge -m "Merge fix in commit-fix" commit-fix
 ------------
 
 Which would result in:

diff --git a/diff-format.txt b/diff-format.txt
index 001503205b24d5c20ec10792c4ab6c4c7221bcb7..9709c35c98bc678d1f2e339c8e2d4bbcd7e6231f 100644 (file)
--- a/diff-format.txt
+++ b/diff-format.txt
@@ -1,5 +1,5 @@
-The output format from "git-diff-index", "git-diff-tree" and
-"git-diff-files" are very similar.
+The output format from "git-diff-index", "git-diff-tree",
+"git-diff-files" and "git diff --raw" are very similar.
 
 These commands all compare two sets of things; what is
 compared differs:
@@ -62,7 +62,8 @@ respectively.
 diff format for merges
 ----------------------
 
-"git-diff-tree" and "git-diff-files" can take '-c' or '--cc' option
+"git-diff-tree", "git-diff-files" and "git-diff --raw"
+can take '-c' or '--cc' option
 to generate diff output also for merge commits.  The output differs
 from the format described above in the following way:
 
@@ -86,10 +87,10 @@ Generating patches with -p
 --------------------------
 
 When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
-with a '-p' option, they do not produce the output described above;
-instead they produce a patch file.  You can customize the creation
-of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS
-environment variables.
+with a '-p' option, or "git diff" without the '--raw' option, they
+do not produce the output described above; instead they produce a
+patch file.  You can customize the creation of such patches via the
+GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.
 
 What the -p option produces is slightly different from the traditional
 diff format.
@@ -137,8 +138,8 @@ file made it into the new one.
 combined diff format
 --------------------
 
-git-diff-tree and git-diff-files can take '-c' or '--cc' option
-to produce 'combined diff', which looks like this:
+"git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or
+'--cc' option to produce 'combined diff', which looks like this:
 
 ------------
 diff --combined describe.c

diff --git a/everyday.html b/everyday.html
index aff69dc4728e1388a2ec3e1d9679ab83b71ccbe9..93c1bc4256c422260525a4e8d283ca46e514c6d3 100644 (file)
--- a/everyday.html
+++ b/everyday.html
@@ -442,7 +442,7 @@ Use a tarball as a starting point for a new repository.
 $ cd frotz\r
 $ git-init\r
 $ git add . <b>(1)</b>\r
-$ git commit -m 'import of frotz source tree.'\r
+$ git commit -m "import of frotz source tree."\r
 $ git tag v2.43 <b>(2)</b></tt></pre>\r
 </div></div>\r
 <ol>\r
@@ -794,7 +794,7 @@ $ git merge topic/one topic/two &amp;&amp; git merge hold/linus <b>(8)</b>
 $ git checkout maint\r
 $ git cherry-pick master~4 <b>(9)</b>\r
 $ compile/test\r
-$ git tag -s -m 'GIT 0.99.9x' v0.99.9x <b>(10)</b>\r
+$ git tag -s -m "GIT 0.99.9x" v0.99.9x <b>(10)</b>\r
 $ git fetch ko &amp;&amp; git show-branch master maint 'tags/ko-*' <b>(11)</b>\r
 $ git push ko <b>(12)</b>\r
 $ git push ko v0.99.9x <b>(13)</b></tt></pre>\r
@@ -1069,7 +1069,7 @@ upload to public HTTP server hosted by your ISP.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:09 UTC\r
+Last updated 03-Nov-2007 02:45:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/everyday.txt b/everyday.txt
index 08c61b1f1ac6ca880c6c3a4f311f65486aabd23e..ce7c170d6982cfd92ca0a23da77cbd6d6901e869 100644 (file)
--- a/everyday.txt
+++ b/everyday.txt
@@ -109,7 +109,7 @@ $ tar zxf frotz.tar.gz
 $ cd frotz
 $ git-init
 $ git add . <1>
-$ git commit -m 'import of frotz source tree.'
+$ git commit -m "import of frotz source tree."
 $ git tag v2.43 <2>
 ------------
 +
@@ -300,7 +300,7 @@ $ git merge topic/one topic/two && git merge hold/linus <8>
 $ git checkout maint
 $ git cherry-pick master~4 <9>
 $ compile/test
-$ git tag -s -m 'GIT 0.99.9x' v0.99.9x <10>
+$ git tag -s -m "GIT 0.99.9x" v0.99.9x <10>
 $ git fetch ko && git show-branch master maint 'tags/ko-*' <11>
 $ git push ko <12>
 $ git push ko v0.99.9x <13>

diff --git a/git-add.html b/git-add.html
index 8b9d24f24208ed674cc5ffb8886121ee5e8341e5..b491d570194d9e908e952ac24481c776bbb0ebb9 100644 (file)
--- a/git-add.html
+++ b/git-add.html
@@ -316,7 +316,7 @@ commit.</p>
 </p>\r
 </dd>\r
 <dt>\r
--n\r
+-n, --dry-run\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -324,7 +324,7 @@ commit.</p>
 </p>\r
 </dd>\r
 <dt>\r
--v\r
+-v, --verbose\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -570,7 +570,7 @@ diff
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Aug-2007 07:30:53 UTC\r
+Last updated 03-Nov-2007 02:45:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-add.txt b/git-add.txt
index 2fe73555559d5a31a7122c9e5ebb039db9428dbc..963e1ab1e2b7437a32f0aff97dda8dae3c4f47a0 100644 (file)
--- a/git-add.txt
+++ b/git-add.txt
@@ -50,10 +50,10 @@ OPTIONS
        and `dir/file2`) can be given to add all files in the
        directory, recursively.
 
--n::
+-n, \--dry-run::
         Don't actually add the file(s), just show if they exist.
 
--v::
+-v, \--verbose::
         Be verbose.
 
 -f::

diff --git a/git-branch.html b/git-branch.html
index 4229be7141b7afbd109db0356819a191ab950899..957b9da8e1111ceace535c2c38257e234d58148f 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -396,7 +396,7 @@ to delete remote-tracking branches.</p>
 </p>\r
 </dd>\r
 <dt>\r
--v\r
+-v, --verbose\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -555,7 +555,7 @@ a branch and check it out with a single command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2007 12:03:44 UTC\r
+Last updated 03-Nov-2007 02:45:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.txt b/git-branch.txt
index b7285bcdbc80a2aa574fa13050c00f1ce9975419..5e81aa4ee15af50bd47aa9b26ffd566328f3c35e 100644 (file)
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -85,7 +85,7 @@ OPTIONS
 -a::
        List both remote-tracking branches and local branches.
 
--v::
+-v, --verbose::
        Show sha1 and commit subject line for each head.
 
 --abbrev=<length>::

diff --git a/git-diff-files.html b/git-diff-files.html
index 41c6bc487c9f391f8c2e5d3e0c36704f7ad1f1c7..f1fcd2ed6925dd84999589d1375cc1330b8b28e6 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -739,8 +739,8 @@ omit diff output for unmerged entries and just show "Unmerged".</p>
 </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>The output format from "git-diff-index", "git-diff-tree",\r
+"git-diff-files" and "git diff --raw" are very similar.</p>\r
 <p>These commands all compare two sets of things; what is\r
 compared differs:</p>\r
 <dl>\r
@@ -878,7 +878,8 @@ respectively.</p>
 </div>\r
 <h2>diff format for merges</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
+<p>"git-diff-tree", "git-diff-files" and "git-diff --raw"\r
+can take <em>-c</em> or <em>--cc</em> option\r
 to generate diff output also for merge commits.  The output differs\r
 from the format described above in the following way:</p>\r
 <ol>\r
@@ -919,10 +920,10 @@ all parents.</p>
 <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
+with a <em>-p</em> option, or "git diff" without the <em>--raw</em> option, they\r
+do not produce the output described above; instead they produce a\r
+patch file.  You can customize the creation of such patches via the\r
+GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p>\r
 <p>What the -p option produces is slightly different from the traditional\r
 diff format.</p>\r
 <ol>\r
@@ -979,8 +980,8 @@ file made it into the new one.</p>
 </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
+<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or\r
+<em>--cc</em> option 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
@@ -1113,7 +1114,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2007 12:03:44 UTC\r
+Last updated 03-Nov-2007 02:45:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index f415f9a48006431fc7b9c6107848bd0b2bbcf256..5f29967a33a017317b377060debbe5065bc850f9 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -727,8 +727,8 @@ entries in the index are compared.</p>
 </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>The output format from "git-diff-index", "git-diff-tree",\r
+"git-diff-files" and "git diff --raw" are very similar.</p>\r
 <p>These commands all compare two sets of things; what is\r
 compared differs:</p>\r
 <dl>\r
@@ -866,7 +866,8 @@ respectively.</p>
 </div>\r
 <h2>diff format for merges</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
+<p>"git-diff-tree", "git-diff-files" and "git-diff --raw"\r
+can take <em>-c</em> or <em>--cc</em> option\r
 to generate diff output also for merge commits.  The output differs\r
 from the format described above in the following way:</p>\r
 <ol>\r
@@ -907,10 +908,10 @@ all parents.</p>
 <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
+with a <em>-p</em> option, or "git diff" without the <em>--raw</em> option, they\r
+do not produce the output described above; instead they produce a\r
+patch file.  You can customize the creation of such patches via the\r
+GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p>\r
 <p>What the -p option produces is slightly different from the traditional\r
 diff format.</p>\r
 <ol>\r
@@ -967,8 +968,8 @@ file made it into the new one.</p>
 </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
+<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or\r
+<em>--cc</em> option 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
@@ -1195,7 +1196,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2007 12:03:46 UTC\r
+Last updated 03-Nov-2007 02:45:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 02401c30885ce42b5b54120149aa985fe84ce13f..a1448a5a05fd80ff246cddf9209e11c9d337c16b 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1209,8 +1209,8 @@ HEAD commits it finds, which is even more interesting.</tt></pre>
 </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>The output format from "git-diff-index", "git-diff-tree",\r
+"git-diff-files" and "git diff --raw" are very similar.</p>\r
 <p>These commands all compare two sets of things; what is\r
 compared differs:</p>\r
 <dl>\r
@@ -1348,7 +1348,8 @@ respectively.</p>
 </div>\r
 <h2>diff format for merges</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
+<p>"git-diff-tree", "git-diff-files" and "git-diff --raw"\r
+can take <em>-c</em> or <em>--cc</em> option\r
 to generate diff output also for merge commits.  The output differs\r
 from the format described above in the following way:</p>\r
 <ol>\r
@@ -1389,10 +1390,10 @@ all parents.</p>
 <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
+with a <em>-p</em> option, or "git diff" without the <em>--raw</em> option, they\r
+do not produce the output described above; instead they produce a\r
+patch file.  You can customize the creation of such patches via the\r
+GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p>\r
 <p>What the -p option produces is slightly different from the traditional\r
 diff format.</p>\r
 <ol>\r
@@ -1449,8 +1450,8 @@ file made it into the new one.</p>
 </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
+<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or\r
+<em>--cc</em> option 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
@@ -1583,7 +1584,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2007 12:03:47 UTC\r
+Last updated 03-Nov-2007 02:45:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index 57ac59bd95076e46df329ea4f5896b5d29ad4ec2..22a1cb03ffa4c821c88f171c35a1ce8e7e921074 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -786,6 +786,369 @@ and the range notations ("<commit>..<commit>" and
 </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",\r
+"git-diff-files" and "git diff --raw" 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 &lt;tree-ish&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        compares the &lt;tree-ish&gt; and the files on the filesystem.\r
+</p>\r
+</dd>\r
+<dt>\r
+git-diff-index --cached &lt;tree-ish&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        compares the &lt;tree-ish&gt; and the index.\r
+</p>\r
+</dd>\r
+<dt>\r
+git-diff-tree [-r] &lt;tree-ish-1&gt; &lt;tree-ish-2&gt; [&lt;pattern&gt;&#8230;]\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 [&lt;pattern&gt;&#8230;]\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>&lt;sha1&gt; 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>diff format for merges</h2>\r
+<div class="sectionbody">\r
+<p>"git-diff-tree", "git-diff-files" and "git-diff --raw"\r
+can take <em>-c</em> or <em>--cc</em> option\r
+to generate diff output also for merge commits.  The output differs\r
+from the format described above in the following way:</p>\r
+<ol>\r
+<li>\r
+<p>\r
+there is a colon for each parent\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+there are more "src" modes and "src" sha1\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+status is concatenated status characters for each parent\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+no optional "score" number\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+single path, only for "dst"\r
+</p>\r
+</li>\r
+</ol>\r
+<p>Example:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM      describe.c</tt></pre>\r
+</div></div>\r
+<p>Note that <em>combined diff</em> lists only files which were modified from\r
+all parents.</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, or "git diff" without the <em>--raw</em> option, they\r
+do not produce the output described above; instead they produce a\r
+patch file.  You can customize the creation of such patches via the\r
+GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS 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 &lt;mode&gt;\r
+new mode &lt;mode&gt;\r
+deleted file mode &lt;mode&gt;\r
+new file mode &lt;mode&gt;\r
+copy from &lt;path&gt;\r
+copy to &lt;path&gt;\r
+rename from &lt;path&gt;\r
+rename to &lt;path&gt;\r
+similarity index &lt;number&gt;\r
+dissimilarity index &lt;number&gt;\r
+index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</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
+<p>The similarity index is the percentage of unchanged lines, and\r
+the dissimilarity index is the percentage of changed lines.  It\r
+is a rounded down integer, followed by a percent sign.  The\r
+similarity index value of 100% is thus reserved for two equal\r
+files, while 100% dissimilarity means that no line from the old\r
+file made it into the new one.</p>\r
+</div>\r
+<h2>combined diff format</h2>\r
+<div class="sectionbody">\r
+<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or\r
+<em>--cc</em> option 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 &gt; 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) &lt; 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 &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;\r
+mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;\r
+new file mode &lt;mode&gt;\r
+deleted file mode &lt;mode&gt;,&lt;mode&gt;</tt></pre>\r
+</div></div>\r
+<p>The <tt>mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;</tt> line appears only if at least one of\r
+the &lt;mode&gt; 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
+&lt;tree-ish&gt; 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>@@@ &lt;from-file-range&gt; &lt;from-file-range&gt; &lt;to-file-range&gt; @@@</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 &#8212;\r
+appears in A but removed in B), <tt>+</tt> (plus &#8212; missing in A but\r
+added to B), or <tt>" "</tt> (space &#8212; unchanged) prefix, this format\r
+compares two or more files file1, file2,&#8230; 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>EXAMPLES</h2>\r
 <div class="sectionbody">\r
 <dl>\r
@@ -948,7 +1311,7 @@ Output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:46 UTC\r
+Last updated 03-Nov-2007 02:45:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.txt b/git-diff.txt
index ce0f5024687056b696fe5e77362a6f01b18dd0bd..11c4216c4a5c705c6af55b1367cae96b13c20251 100644 (file)
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -82,6 +82,9 @@ include::diff-options.txt[]
        the diff to the named paths (you can give directory
        names and get diff for all files under them).
 
+Output format
+-------------
+include::diff-format.txt[]
 
 EXAMPLES
 --------

diff --git a/git-filter-branch.html b/git-filter-branch.html
index b601400b284dbf14df3299be06255388cb105385..254fc57dbbe15006ff63835b6f8e720580a2b84c 100644 (file)
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -454,7 +454,7 @@ definition impossible to preserve signatures at any rate.)</p>
 </p>\r
 </dd>\r
 <dt>\r
--f\|--force\r
+-f|--force\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -593,7 +593,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 02-Nov-2007 02:47:20 UTC\r
+Last updated 03-Nov-2007 02:45:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-filter-branch.txt b/git-filter-branch.txt
index 385ecc900f2d7f4c982a96f1a97607334682e074..895d7503100632f5ab79af548fed3b3a6d79c413 100644 (file)
--- a/git-filter-branch.txt
+++ b/git-filter-branch.txt
@@ -152,7 +152,7 @@ definition impossible to preserve signatures at any rate.)
        does this in the '.git-rewrite/' directory but you can override
        that choice by this parameter.
 
--f\|--force::
+-f|--force::
        `git filter-branch` refuses to start with an existing temporary
        directory or when there are already refs starting with
        'refs/original/', unless forced.

diff --git a/git-mv.html b/git-mv.html
index f53d03dbe90e15790e5f57e597324502bed33c01..1556fdf9062266e403eb9d821b72e01b345db504 100644 (file)
--- a/git-mv.html
+++ b/git-mv.html
@@ -312,7 +312,7 @@ committed.</p>
 </p>\r
 </dd>\r
 <dt>\r
--n\r
+-n, --dry-run\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer &lt;Josef.Weidendorfer@gmx.de&gt;
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:47 UTC\r
+Last updated 03-Nov-2007 02:45:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mv.txt b/git-mv.txt
index 2c9cf743c7a097ab955938d023e347e866fbc13e..3b8ca76dff5efb3b5a9f07b459889333518f04ed 100644 (file)
--- a/git-mv.txt
+++ b/git-mv.txt
@@ -34,7 +34,7 @@ OPTIONS
        condition. An error happens when a source is neither existing nor
         controlled by GIT, or when it would overwrite an existing
         file unless '-f' is given.
--n::
+-n, \--dry-run::
        Do nothing; only show what would happen
 
 

diff --git a/git-reset.html b/git-reset.html
index c510bcd397033e269e3f332204bfd671b7c9b383..7b334cdb8a088c319f61a3265ac29d2126f783bc 100644 (file)
--- a/git-reset.html
+++ b/git-reset.html
@@ -522,7 +522,7 @@ need to get to the other branch for a quick bugfix.</p>
 <div class="content">\r
 <pre><tt>$ git checkout feature ;# you were working in "feature" branch and\r
 $ work work work       ;# got interrupted\r
-$ git commit -a -m 'snapshot WIP'                 <b>(1)</b>\r
+$ git commit -a -m "snapshot WIP"                 <b>(1)</b>\r
 $ git checkout master\r
 $ fix fix fix\r
 $ git commit ;# commit with real log\r
@@ -567,7 +567,7 @@ At this point the index file still has all the WIP changes you
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 02-Aug-2007 07:23:09 UTC\r
+Last updated 03-Nov-2007 02:45:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reset.txt b/git-reset.txt
index 15e3aca9a17cbcc651079968c76b571a9d144696..87afa6f8da0c6421e909663fe79a6f8b0fc0a7d8 100644 (file)
--- a/git-reset.txt
+++ b/git-reset.txt
@@ -157,7 +157,7 @@ need to get to the other branch for a quick bugfix.
 ------------
 $ git checkout feature ;# you were working in "feature" branch and
 $ work work work       ;# got interrupted
-$ git commit -a -m 'snapshot WIP'                 <1>
+$ git commit -a -m "snapshot WIP"                 <1>
 $ git checkout master
 $ fix fix fix
 $ git commit ;# commit with real log

diff --git a/git-rm.html b/git-rm.html
index 3b5a56c277351603f9bef4855d860789728e75cb..6e063c6e160d675340ec6a8158db194ec90dd4f5 100644 (file)
--- a/git-rm.html
+++ b/git-rm.html
@@ -306,7 +306,7 @@ match either the tip of the branch <strong>or</strong> the file on disk.</p>
 </p>\r
 </dd>\r
 <dt>\r
--n\r
+-n, --dry-run\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -352,7 +352,7 @@ match either the tip of the branch <strong>or</strong> the file on disk.</p>
 </p>\r
 </dd>\r
 <dt>\r
---quiet\r
+-q, --quiet\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -415,7 +415,7 @@ git-rm -f git-*.sh
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:53 UTC\r
+Last updated 03-Nov-2007 02:45:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rm.txt b/git-rm.txt
index be61a821642ada0a0e8e3303aa81463c716fd970..48c1d97f93220ed4d71d3e95e7d75025d77f153d 100644 (file)
--- a/git-rm.txt
+++ b/git-rm.txt
@@ -30,7 +30,7 @@ OPTIONS
 -f::
        Override the up-to-date check.
 
--n::
+-n, \--dry-run::
         Don't actually remove the file(s), just show if they exist in
         the index.
 
@@ -51,7 +51,7 @@ OPTIONS
 \--ignore-unmatch::
        Exit with a zero status even if no files matched.
 
-\--quiet::
+-q, \--quiet::
        git-rm normally outputs one line (in the form of an "rm" command)
        for each file removed. This option suppresses that output.
 

diff --git a/git-stripspace.html b/git-stripspace.html
index 04bb82d125e2607140de2b6d3ae573d393528957..6715d85fcfa8216217737c3a74cf2f69c33e0e77 100644 (file)
--- a/git-stripspace.html
+++ b/git-stripspace.html
@@ -282,7 +282,7 @@ git-stripspace(1) Manual Page
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
--s\|--strip-comments\r
+-s|--strip-comments\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -313,7 +313,7 @@ git-stripspace(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 11-Aug-2007 08:29:16 UTC\r
+Last updated 03-Nov-2007 02:45:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-stripspace.txt b/git-stripspace.txt
index 5212358306a684c006e8ca30c3f7e21fb3c97afb..f80526ba7e013ef58ec43e8861b03696729aaa5b 100644 (file)
--- a/git-stripspace.txt
+++ b/git-stripspace.txt
@@ -16,7 +16,7 @@ Remove multiple empty lines, and empty lines at beginning and end.
 
 OPTIONS
 -------
--s\|--strip-comments::
+-s|--strip-comments::
        In addition to empty lines, also strip lines starting with '#'.
 
 <stream>::

diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html
index 4b78b8348bbb04d0c7566b7eb666535b4014c6d1..d922ccf4cc1455ef0e9fcb19693ac341adb6bc15 100644 (file)
--- a/git-symbolic-ref.html
+++ b/git-symbolic-ref.html
@@ -290,7 +290,7 @@ a regular file whose contents is <tt>ref: refs/heads/master</tt>.</p>
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
--q\r
+-q, --quiet\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -336,7 +336,7 @@ name is not a symbolic ref, or 128 if another error occurs.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:57 UTC\r
+Last updated 03-Nov-2007 02:45:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt
index a88f7228605ee35002573123f3dbe63c3e405dc6..694cabab2453ab19cfa4e4fd5eaa186f9b2fa9ba 100644 (file)
--- a/git-symbolic-ref.txt
+++ b/git-symbolic-ref.txt
@@ -26,7 +26,7 @@ a regular file whose contents is `ref: refs/heads/master`.
 OPTIONS
 -------
 
--q::
+-q, --quiet::
        Do not issue an error message if the <name> is not a
        symbolic ref but a detached HEAD; instead exit with
        non-zero status silently.