diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-15 03:13:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-15 03:13:34 -0700 |
| commit | d7b6c3c0f54b951c85cd41c6e6571c65cf090111 (patch) | |
| tree | 44c009ddd29ab5a986dba9028d0b57a0b2e03201 /Documentation/diff-options.txt | |
| parent | 4c5cf8c44ce06a79da5bafd4a92e6d6f598cea2e (diff) | |
| parent | 3cd4f5e8eb04ae01298ceaf46bb41a4277031916 (diff) | |
| download | git-d7b6c3c0f54b951c85cd41c6e6571c65cf090111.tar.gz | |
Merge branch 'master' into pb/gitpm
* master: (166 commits)
git-apply --binary: clean up and prepare for --reverse
Fix detection of ipv6 on Solaris
Look for sockaddr_storage in sys/socket.h
Solaris has strlcpy() at least since version 8
git-apply --reverse: simplify reverse option.
t4116 apply --reverse test
Make sha1flush void and remove conditional return.
Make upload_pack void and remove conditional return.
Make track_tree_refs void.
Make pack_objects void.
Make fsck_dir void.
Make checkout_all void.
Make show_entry void
Make pprint_tag void and cleans up call in cmd_cat_file.
Remove combine-diff.c::uninteresting()
read-cache.c cleanup
http-push.c cleanup
diff.c cleanup
builtin-push.c cleanup
builtin-grep.c cleanup
...
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 47ba9a403a..b5d9763594 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -36,6 +36,9 @@ Turn off colored diff, even when the configuration file gives the default to color output. +--color-words:: + Show colored word diff, i.e. color words which have changed. + --no-renames:: Turn off rename detection, even when the configuration file gives the default to do so. |