author | Junio C Hamano <gitster@pobox.com> | |
Fri, 10 Feb 2012 21:59:02 +0000 (13:59 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 10 Feb 2012 21:59:02 +0000 (13:59 -0800) | ||
commit | 184a7aa7bf8e42ce9aba12b92d9cf8014d04a947 | |
tree | 625805572842c984cc7600e4880fdff4549e6558 | tree | snapshot |
parent | 5febbda4e7afb4f26bed9d2dc5f9c4ceca86d2b8 | commit | diff |
parent | 50dd0f2fd910d9973760db052897ee8e73ed2f1f | commit | diff |
Merge branch 'tr/grep-l-with-decoration' into maint
* tr/grep-l-with-decoration:
grep: fix -l/-L interaction with decoration lines
* tr/grep-l-with-decoration:
grep: fix -l/-L interaction with decoration lines