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)
commit7a4566befef02b99aad3038f116b3ac24c4eb464
tree7f7d4e6d95ddda85d4d86438f058363beafe9d2e
parent3ea95d2b0e6fa63e66de24a5084e217102ab9e8a
parent3bc52d7a95676bcdeeb61c372b44358daf817baa
Merge branch 'mh/cherry-default'

* mh/cherry-default:
  Documentation: clarify which parameters are optional to git-cherry
  git-cherry: make <upstream> parameter optional
builtin-log.c