| commit | 6baa9bd882fe003478c42ee5709dcfc713e13ec9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 19 Aug 2010 22:49:24 +0000 (19 15:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 19 Aug 2010 22:49:24 +0000 (19 15:49 -0700) | ||
| tree | 4b69a00457e22edcecc6d6e91d74d25b53ebf5d7 | treesnapshot (tar.gz zip) |
| parent | 0a4139b5f283ef5e817afaafd9e7e2a149220cc4 | commitdiff |
| parent | f7bff00314f473be1ef6c166e91447fabd1822d8 | commitdiff |
Merge branch 'jc/sha1-name-find-fix' into maint
* jc/sha1-name-find-fix:
sha1_name.c: fix parsing of ":/token" syntax
Conflicts:
sha1_name.c
* jc/sha1-name-find-fix:
sha1_name.c: fix parsing of ":/token" syntax
Conflicts:
sha1_name.c
| sha1_name.c | diff1 | diff2 | blobhistory |