Merge branch 'mh/cherry-default'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2009 07:09:09 +0000 (23:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2009 07:09:09 +0000 (23:09 -0800)
* mh/cherry-default:
  Documentation: clarify which parameters are optional to git-cherry
  git-cherry: make <upstream> parameter optional

1  2 
builtin-log.c

diff --cc builtin-log.c
Simple merge