aboutsummaryrefslogtreecommitdiffstats
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-27 14:38:22 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-27 14:38:23 -0700
commit88f90f8286e9e456ea332e00f87ad39892103544 (patch)
treeadc94f5e7e6fa961ccfffb7197fc0df0b664e3a4 /commit.h
parentMerge branch 'rr/push-head' into maint (diff)
parentdifftool --dir-diff: allow changing any clean working tree file (diff)
downloadgit-88f90f8286e9e456ea332e00f87ad39892103544.tar.gz
git-88f90f8286e9e456ea332e00f87ad39892103544.zip
Merge branch 'ks/difftool-dir-diff-copy-fix' into maint
* ks/difftool-dir-diff-copy-fix: difftool --dir-diff: allow changing any clean working tree file
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions