diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
commit | eb415999b469f6d3e718f2fdf28dd460d8db5f4f (patch) | |
tree | ca4b12fcea8cc51c42b66ee456255ee4ea85b203 /git-diff-files.html | |
parent | e2b205c118b67a65b1bde35ff88de1f7aceae8d0 (diff) | |
download | git-htmldocs-eb415999b469f6d3e718f2fdf28dd460d8db5f4f.tar.gz |
Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
Diffstat (limited to 'git-diff-files.html')
-rw-r--r-- | git-diff-files.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-diff-files.html b/git-diff-files.html index 5d0a4a7b9..4b0792b86 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -773,7 +773,10 @@ cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show "Unmerged".</p>
</dd>
<dt>
--c,--cc
+-c
+</dt>
+<dt>
+--cc
</dt>
<dd>
<p>
@@ -1288,7 +1291,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:33 UTC
+Last updated 08-Jun-2008 22:46:33 UTC
</div>
</div>
</body>
|