summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-07 12:28:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-07 19:28:54 (GMT)
commitb53766483ff14f73be954617349b18ea56c3187a (patch)
tree239618175b5d477ddeb61b09db5bf8198e026095
parentfef88bb0134dfd47b4bd17e668bbb860588dcb39 (diff)
downloadgit-b53766483ff14f73be954617349b18ea56c3187a.zip
git-b53766483ff14f73be954617349b18ea56c3187a.tar.gz
git-b53766483ff14f73be954617349b18ea56c3187a.tar.bz2
Update diff-options and config documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/config.txt16
-rw-r--r--Documentation/diff-options.txt26
2 files changed, 38 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5290a8f..0b434c1 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -110,6 +110,22 @@ apply.whitespace::
Tells `git-apply` how to handle whitespaces, in the same way
as the '--whitespace' option. See gitlink:git-apply[1].
+diff.color::
+ When true (or `always`), always use colors in patch.
+ When false (or `never`), never. When set to `auto`, use
+ colors only when the output is to the terminal.
+
+diff.color.<slot>::
+ Use customized color for diff colorization. `<slot>`
+ specifies which part of the patch to use the specified
+ color, and is one of `plain` (context text), `meta`
+ (metainformation), `frag` (hunk header), `old` (removed
+ lines), or `new` (added lines). The value for these
+ configuration variables can be one of: `normal`, `bold`,
+ `dim`, `ul`, `blink`, `reverse`, `reset`, `black`,
+ `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, or
+ `white`.
+
diff.renameLimit::
The number of files to consider when performing the copy/rename
detection; equivalent to the git diff option '-l'.
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 1a93629..47ba9a4 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,18 +4,21 @@
-u::
Synonym for "-p".
+--raw::
+ Generate the raw format.
+
--patch-with-raw::
- Generate patch but keep also the default raw diff output.
+ Synonym for "-p --raw".
--stat::
- Generate a diffstat instead of a patch.
+ Generate a diffstat.
--summary::
Output a condensed summary of extended header information
such as creations, renames and mode changes.
--patch-with-stat::
- Generate patch and prepend its diffstat.
+ Synonym for "-p --stat".
-z::
\0 line termination on output
@@ -26,10 +29,25 @@
--name-status::
Show only names and status of changed files.
+--color::
+ Show colored diff.
+
+--no-color::
+ Turn off colored diff, even when the configuration file
+ gives the default to color output.
+
+--no-renames::
+ Turn off rename detection, even when the configuration
+ file gives the default to do so.
+
--full-index::
Instead of the first handful characters, show full
object name of pre- and post-image blob on the "index"
- line when generating a patch format output.
+ line when generating a patch format output.
+
+--binary::
+ In addition to --full-index, output "binary diff" that
+ can be applied with "git apply".
--abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object