| commit | fa4946b5532ff911565c882892a715616c22cdec | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Jul 2008 00:16:29 +0000 (20 17:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Jul 2008 00:16:29 +0000 (20 17:16 -0700) | ||
| tree | d6c503fcee7de1794ae552760ad313501714dad1 | treesnapshot (tar.gz zip) |
| parent | 107cee507884dc9b3c5d3759e8e50c9c47e2ddcd | commitdiff |
| parent | 2d9c572578c72bd6691e80a9feed7d631baf007f | commitdiff |
Merge branch 'maint'
* maint:
fix usage string for git grep
refresh-index: fix bitmask assignment
Conflicts:
builtin-grep.c
* maint:
fix usage string for git grep
refresh-index: fix bitmask assignment
Conflicts:
builtin-grep.c
| builtin-grep.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |