Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Wed, 1 Nov 2006 23:09:55 +0000 (15:09 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 1 Nov 2006 23:09:55 +0000 (15:09 -0800)
* maint:
  pack-objects doesn't create random pack names
  link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure

1  2 
Documentation/git-pack-objects.txt
sha1_file.c

Simple merge
diff --cc sha1_file.c
Simple merge