Merge branch 'ef/cherry-abbrev'
commit40a56f45bcfeb5443bbd3b7f9e9f7ffd570d5398
authorJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 19:28:40 +0000 (3 12:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 19:28:40 +0000 (3 12:28 -0700)
tree01d74a353d985bda705de764d0ab738dc4f83d7c
parent0cb050abc2e7f05894f9f79d5330ce4559653af6
parent531e758d9c861facd4ebcc8c9b0e4e1443b5665a
Merge branch 'ef/cherry-abbrev'

* ef/cherry-abbrev:
  ls: remove redundant logic
  cherry: support --abbrev option
builtin/log.c