projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b81827b 950b568)
Merge branch 'da/p4merge-mktemp'
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Jan 2013 18:29:32 +0000 (10:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Jan 2013 18:29:32 +0000 (10:29 -0800)
commit894610af58244e46d1479acfa527483f30e896ec
tree849f724b4dfc454da2122326b7f01c7951397c8btree | snapshot
parentb81827b6b642da698e5d32fb54d74687dcf223cccommit | diff
parent950b5680bdacd3eaa4a528f4dc2d5652f1beb88dcommit | diff
Merge branch 'da/p4merge-mktemp'

Create an empty file in $TMPDIR instead of using an empty file in
the local directory.

* da/p4merge-mktemp:
  mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
Git—the stupid content tracker