OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b81827b
950b568
)
Merge branch 'da/p4merge-mktemp'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 3 Jan 2013 18:29:32 +0000
(10:29 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 3 Jan 2013 18:29:32 +0000
(10:29 -0800)
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
Trivial merge
OSDN Git Service
