Merge branch 'ef/cherry-abbrev'
authorJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 19:28:40 +0000 (12:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 19:28:40 +0000 (12:28 -0700)
* ef/cherry-abbrev:
  ls: remove redundant logic
  cherry: support --abbrev option

1  2 
builtin/log.c

diff --cc builtin/log.c
Simple merge