Merge branch 'da/pretty-tempname'
commitb11cf09043f18b368ec0d988f064ea21247c843d
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jun 2009 07:50:05 +0000 (3 00:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jun 2009 07:50:05 +0000 (3 00:50 -0700)
tree864a5086870ab9f5e48b3f6e2d5fa1264e9f074a
parentceff8e7adeed51024491deb4933f23db760e5641
parent003b33a8ad686ee4a0d0b36635bfd6aba940b24a
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
Makefile
git-compat-util.h