aboutsummaryrefslogtreecommitdiffstats
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-25 08:03:20 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-25 08:03:20 -0800
commita8e00d7b83e0c810a16cb441b9d0601be7706f2c (patch)
tree0c79db017155493e67f0938fd66db89ecc2df920 /commit.h
parentDocumentation: "advice" is uncountable (diff)
parentmergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder (diff)
downloadgit-a8e00d7b83e0c810a16cb441b9d0601be7706f2c.tar.gz
git-a8e00d7b83e0c810a16cb441b9d0601be7706f2c.zip
Merge branch 'da/p4merge-mktemp' into maint
* da/p4merge-mktemp: mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions