summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-04 14:57:33 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-04 14:57:33 -0700
commitf6bfe767149c15b359106cb9f138853be3c14667 (patch)
tree17428de7a9e4a1b904f727826b6c2c4f643e79a0 /unpack-trees.c
parent0752000c2af829a1d220b9eb51b3fad331bc0038 (diff)
parent4b56cf58a9ee684d47e01d815eccd75252d61da5 (diff)
downloadgit-f6bfe767149c15b359106cb9f138853be3c14667.tar.gz
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()
Diffstat (limited to 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions