![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Mar 2010 20:44:06 +0000 (12:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Mar 2010 20:44:06 +0000 (12:44 -0800) | ||
| commit | c06951894ac943b2aaa288b0e9dc1eb605dfb7b6 | |
| tree | c84152355c7fe666d0bb16197e36eb63e33e0c13 | tree | snapshot |
| parent | 6954ef206343d366c365f5946caa967f92d7bab1 | commit | diff |
| parent | 73e9da019655261e456ed862340880de365111f0 | commit | diff |
Merge branch 'ml/color-when'
* ml/color-when:
Add an optional argument for --color options
* ml/color-when:
Add an optional argument for --color options
| Documentation/git-grep.txt | diff1 | | diff2 | | blob | history |
| Documentation/git-show-branch.txt | diff1 | | diff2 | | blob | history |
| builtin-grep.c | diff1 | | diff2 | | blob | history |
| builtin-show-branch.c | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |