Merge branch 'jc/reflog' into lj/refs
authorJunio C Hamano <junkio@cox.net>
Fri, 27 Oct 2006 01:48:30 +0000 (18:48 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 27 Oct 2006 01:48:30 +0000 (18:48 -0700)
commit2e6d8f181dd77d40a1148549d4f33cdf2877fb19
treec6b7c9245913f96d89466a5f3db58f595686dc47
parent97f7a7bd0d9d618e503623ded5b22eafada9e174
parent694500edbd51baef365c588986abe41f01acf0de
Merge branch 'jc/reflog' into lj/refs

* jc/reflog:
  sha1_name.c: avoid compilation warnings.
  ref-log: allow ref@{count} syntax.
refs.c