summaryrefslogtreecommitdiff
path: root/mergetools/tkdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-10-01 12:58:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-10-01 12:58:52 -0700
commit69759917aa4b1efb5bf198e76c3664bed9c70d4d (patch)
tree28d90192dff1026e69b25bbdc0822d05d7fc7402 /mergetools/tkdiff
parentMerge branch 'jc/blame-follows-renames' (diff)
parentcommit: pay attention to submodule.$name.ignore in .gitmodules (diff)
downloadtgif-69759917aa4b1efb5bf198e76c3664bed9c70d4d.tar.xz
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 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions