projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0a4139b f7bff00)
Merge branch 'jc/sha1-name-find-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Aug 2010 22:49:24 +0000 (15:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Aug 2010 22:49:24 +0000 (15:49 -0700)
commit6baa9bd882fe003478c42ee5709dcfc713e13ec9
tree4b69a00457e22edcecc6d6e91d74d25b53ebf5d7tree | snapshot
parent0a4139b5f283ef5e817afaafd9e7e2a149220cc4commit | diff
parentf7bff00314f473be1ef6c166e91447fabd1822d8commit | diff
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
sha1_name.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.