summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-01 19:58:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-01 19:58:52 (GMT)
commit69759917aa4b1efb5bf198e76c3664bed9c70d4d (patch)
tree28d90192dff1026e69b25bbdc0822d05d7fc7402 /t/t7800-difftool.sh
parent4dbf436bffdf43f91852e23018fc0e45c1bfdab8 (diff)
parent8f6811efed5451c72aac53f8ee12b1edcd426a73 (diff)
downloadgit-69759917aa4b1efb5bf198e76c3664bed9c70d4d.zip
git-69759917aa4b1efb5bf198e76c3664bed9c70d4d.tar.gz
git-69759917aa4b1efb5bf198e76c3664bed9c70d4d.tar.bz2
Merge branch 'os/commit-submodule-ignore'
"git status" honored the ignore=dirty settings in .gitmodules but "git commit" didn't. * os/commit-submodule-ignore: commit: pay attention to submodule.$name.ignore in .gitmodules
Diffstat (limited to 't/t7800-difftool.sh')
0 files changed, 0 insertions, 0 deletions