Merge branch 'mg/reflog-with-options' into maint
commitf6bfe767149c15b359106cb9f138853be3c14667
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:33 +0000 (4 14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:33 +0000 (4 14:57 -0700)
tree17428de7a9e4a1b904f727826b6c2c4f643e79a0
parent0752000c2af829a1d220b9eb51b3fad331bc0038
parent4b56cf58a9ee684d47e01d815eccd75252d61da5
Merge branch 'mg/reflog-with-options' into maint

* mg/reflog-with-options:
  reflog: fix overriding of command line options
  t/t1411: test reflog with formats
  builtin/log.c: separate default and setup of cmd_log_init()
builtin/log.c