summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-01-27 10:23:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-01-27 10:23:53 -0800
commit5ce3258122939f93a927c75d308c1c34038f0386 (patch)
treef4a60897502baeb1be16c81b4dafc08aa5c5bdac /git-difftool.perl
parentrebase: give a better error message for bogus branch (diff)
parentfast-import: treat filemodify with empty tree as delete (diff)
downloadtgif-5ce3258122939f93a927c75d308c1c34038f0386.tar.xz
Merge branch 'jn/fast-import-empty-tree-removal' into maint
* jn/fast-import-empty-tree-removal: fast-import: treat filemodify with empty tree as delete
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions