]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6ad8b8e 94d3997)
Merge branch 'js/difftool-builtin'
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:15:00 +0000 (13:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:15:00 +0000 (13:15 -0800)
commitb7786bb4b09463641f3e39eca18aefc630ee4f38
tree63238e141abb3839d670e50a39b8da7ceb1fe2f7tree | snapshot
parent6ad8b8e98faa5a301a98a2997da162dea060672ecommit | diff
parent94d3997ecc09f36d17b9ad4b49c4709885e300f7commit | diff
Merge branch 'js/difftool-builtin'

Rewrite a scripted porcelain "git difftool" in C.

* js/difftool-builtin:
  difftool: hack around -Wzero-length-format warning
  difftool: retire the scripted version
  difftool: implement the functionality in the builtin
  difftool: add a skeleton for the upcoming builtin
Makefile diff1 | diff2 | blob | history
contrib/examples/git-difftool.perl diff1 | diff2 | blob | history
git.c diff1 | diff2 | blob | history
t/t7800-difftool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.