diff options
author | Junio C Hamano <junio@kernel.org> | 2011-05-06 20:23:48 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2011-05-06 20:23:48 +0000 |
commit | 5f2627d81e2612a0dddd84a6160151a6780cb4a6 (patch) | |
tree | 353df7a3ca045ac1e013c3d9ead7e76bc27eab67 /git-diff-index.html | |
parent | a0dac24be13be68433d39012e1ae5e16f720f443 (diff) | |
download | git-htmldocs-5f2627d81e2612a0dddd84a6160151a6780cb4a6.tar.gz |
Autogenerated HTML docs for v1.7.5.1-217-g4e3aa
Diffstat (limited to 'git-diff-index.html')
-rw-r--r-- | git-diff-index.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-diff-index.html b/git-diff-index.html index 0dd554cb5..e14018758 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -601,7 +601,8 @@ any of those replacements occurred.</p></div> <dd>
<p>
Show colored diff.
- The value must be always (the default), never, or auto.
+ The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
+ The default value is <tt>never</tt>.
</p>
</dd>
<dt class="hdlist1">
@@ -609,9 +610,8 @@ any of those replacements occurred.</p></div> </dt>
<dd>
<p>
- Turn off colored diff, even when the configuration file
- gives the default to color output.
- Same as <tt>--color=never</tt>.
+ Turn off colored diff.
+ It is the same as <tt>--color=never</tt>.
</p>
</dd>
<dt class="hdlist1">
@@ -787,7 +787,7 @@ another file.</p></div> <dd>
<p>
Detect renames.
- If <tt>n</tt> is specified, it is a is a threshold on the similarity
+ If <tt>n</tt> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
file’s size). For example, <tt>-M90%</tt> means git should consider a
delete/add pair to be a rename if more than 90% of the file
|