diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:46:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:46:50 -0700 |
commit | 532b74b2104bd00cbaa99e726e6a7b8997f48744 (patch) | |
tree | 0405c0e59f424878a3d4acc693c7ddac46bf3ab1 /dir.c | |
parent | c26901a8ff8aa25a584551ee946516e8dc8a704a (diff) | |
parent | 26be15f09db15d2b53a13d0f184d77fb54367f33 (diff) | |
download | git-532b74b2104bd00cbaa99e726e6a7b8997f48744.tar.gz |
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 'dir.c')
0 files changed, 0 insertions, 0 deletions