]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 617cf93 3d0e75f)
Merge branch 'jc/color-diff-doc' into maint-1.8.1
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:44:53 +0000 (13:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:44:53 +0000 (13:44 -0700)
The "--color=<when>" argument to the commands in the diff family
was described poorly.

* jc/color-diff-doc:
  diff-options: unconfuse description of --color

1  2 
Documentation/diff-options.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/diff-options.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.