]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0752000 4b56cf5)
Merge branch 'mg/reflog-with-options' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:33 +0000 (14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:33 +0000 (14:57 -0700)
* 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()

1  2 
builtin/log.c patch | diff1 | diff2 | blob | history

diff --cc builtin/log.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.