From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jun 2009 07:50:05 +0000 (-0700)
Subject: Merge branch 'da/pretty-tempname'
X-Git-Tag: v1.6.4-rc0~87
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b11cf09043f18b368ec0d988f064ea21247c843d?hp=b11cf09043f18b368ec0d988f064ea21247c843d

Merge branch 'da/pretty-tempname'

* da/pretty-tempname:
diff: generate pretty filenames in prep_temp_blob()
compat: add a basename() compatibility function
compat: add a mkstemps() compatibility function

Conflicts:
Makefile
---