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)
* jc/reflog:
  sha1_name.c: avoid compilation warnings.
  ref-log: allow ref@{count} syntax.

1  2 
refs.c

diff --cc refs.c
Simple merge