summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-03 15:37:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-03 15:37:28 -0700
commit16798d0f48c64c4d967c1598a6748ff8c1b87112 (patch)
tree566b6d7db549e6720af66801fb03fdae906b8fe6
parentMerge branch 'jk/maint-push-progress' (diff)
parentMerge branch 'jc/merge-reduce-parents-early' into maint (diff)
downloadtgif-16798d0f48c64c4d967c1598a6748ff8c1b87112.tar.xz
Merge branch 'maint'
* maint:
0 files changed, 0 insertions, 0 deletions