Junio C Hamano 82b955c513 Merge branch 'jc/color-diff-doc' into maint-1.8.1
The "--color=<when>" argument to the commands in the diff family
was described poorly.

* jc/color-diff-doc:
  diff-options: unconfuse description of --color
2013-03-25 13:44:53 -07:00
..
2013-03-01 13:15:29 -08:00
2012-04-20 15:49:16 -07:00
2012-07-09 14:40:03 -07:00
2012-09-25 10:39:52 -07:00
2012-09-18 21:49:50 -07:00
2012-06-19 11:35:19 -07:00
2011-12-12 11:52:31 -08:00
2011-09-06 11:42:12 -07:00
2012-11-14 13:49:53 -08:00
2012-06-19 11:35:19 -07:00