diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:32:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:32:49 -0700 |
| commit | 3d045897585c4b1ca0dce6bb5a33331f1b48c2bf (patch) | |
| tree | 34e52c7654827bf06d83b6e04c16fa3e5e2b0c53 /builtin/grep.c | |
| parent | Merge branch 'jn/doc-pull' (diff) | |
| parent | sha1_name.c: fix parsing of ":/token" syntax (diff) | |
| download | tgif-3d045897585c4b1ca0dce6bb5a33331f1b48c2bf.tar.xz | |
Merge branch 'jc/sha1-name-find-fix'
* jc/sha1-name-find-fix:
sha1_name.c: fix parsing of ":/token" syntax
Conflicts:
sha1_name.c
Diffstat (limited to 'builtin/grep.c')
0 files changed, 0 insertions, 0 deletions