projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e96e98b 688684e)
Merge branch 'da/mergetool-temporary-directory'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:42 +0000 (13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:42 +0000 (13:28 -0700)
commita46af5946c3ec125e0c2fee889610485eb4a6e14
tree3ed40836fea576ca667c5704412122780437e2c4tree | snapshot
parente96e98b3399ae4c638466f84068fe94d4712c5a3commit | diff
parent688684eba436c021eaddab1725093bb953cf260dcommit | diff
Merge branch 'da/mergetool-temporary-directory'

Allow a temporary directory specified to be used while running "git
mergetool" backend.

* da/mergetool-temporary-directory:
  t7610-mergetool: add test cases for mergetool.writeToTemp
  mergetool: add an option for writing to a temporary directory
Documentation/config.txt diff1 | diff2 | blob | history
git-mergetool.sh diff1 | diff2 | blob | history
t/t7610-mergetool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.