Merge branch 'mg/reflog-with-options'
commit95fd6e21f1e7656d3760346ec08b2d43133cba9c
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:41 +0000 (27 11:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:41 +0000 (27 11:36 -0700)
tree68c9c6308b455ce4edda5a06152e19ee00016a78
parent1de0746d849c64e1f4d160f9915d87d39c0794ea
parent4b56cf58a9ee684d47e01d815eccd75252d61da5
Merge branch 'mg/reflog-with-options'

* 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