summaryrefslogtreecommitdiff
path: root/builtin/cat-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-06 12:18:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-06 12:18:47 -0700
commit2fc0c022e60f54be55d6065b9a8abccdc0f67bab (patch)
treed3d9bf5d28501b57fd4130c05f9da212c0784936 /builtin/cat-file.c
parentMerge branch 'fc/show-branch-in-rebase-am' (diff)
parentdifftool --dir-diff: allow changing any clean working tree file (diff)
downloadtgif-2fc0c022e60f54be55d6065b9a8abccdc0f67bab.tar.xz
Merge branch 'ks/difftool-dir-diff-copy-fix'
"difftool --dir-diff" did not copy back changes made by the end-user in the diff tool backend to the working tree in some cases. * ks/difftool-dir-diff-copy-fix: difftool --dir-diff: allow changing any clean working tree file
Diffstat (limited to 'builtin/cat-file.c')
0 files changed, 0 insertions, 0 deletions