summaryrefslogtreecommitdiff
path: root/t/t6029-merge-subtree.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-12 21:46:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-12 21:46:50 -0700
commit532b74b2104bd00cbaa99e726e6a7b8997f48744 (patch)
tree0405c0e59f424878a3d4acc693c7ddac46bf3ab1 /t/t6029-merge-subtree.sh
parentMerge branch 'gt/maint-1.6.1-utf8-width' into maint-1.6.1 (diff)
parentfilter-branch: do not consider diverging submodules a 'dirty worktree' (diff)
downloadtgif-532b74b2104bd00cbaa99e726e6a7b8997f48744.tar.xz
Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1
* js/maint-1.6.1-filter-branch-submodule: filter-branch: do not consider diverging submodules a 'dirty worktree'
Diffstat (limited to 't/t6029-merge-subtree.sh')
0 files changed, 0 insertions, 0 deletions