summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-12 21:45:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-12 21:45:02 -0700
commit54e7e7891b75741ba745e783dd5c5f488f377438 (patch)
tree61a78c7f536a73b6cfaafee7595fc35680a9826e /dir.c
parentMerge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1 (diff)
parentFix submodule squashing into unrelated commit (diff)
downloadtgif-54e7e7891b75741ba745e783dd5c5f488f377438.tar.xz
Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1
* js/maint-1.6.1-rebase-i-submodule: Fix submodule squashing into unrelated commit rebase -i squashes submodule changes into unrelated commit
Diffstat (limited to 'dir.c')
0 files changed, 0 insertions, 0 deletions