summaryrefslogtreecommitdiff
path: root/builtin/commit.c
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 /builtin/commit.c
parent6be17ec5828386c3ae17af26fac66f65f1c817ec (diff)
parent32eaf1de7f79c4ba09f3de3261c84e52e0a67af5 (diff)
downloadgit-88f90f8286e9e456ea332e00f87ad39892103544.tar.gz
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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions