Merge branch 'maint-1.8.5' into maint-1.9
commitd22acacf810a92d5634099a7db0367ce5b6fdcef
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:10:30 +0000 (16 11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:10:30 +0000 (16 11:10 -0700)
tree9536fe05bcb4067f19cd8020bc5bc04c468df7b7
parent34d5217584ee4722d0c0b07ed6c8f1f01ad157c3
parent8c2cfa55446f542454eb4acc7f49d1747e425c94
Merge branch 'maint-1.8.5' into maint-1.9

* maint-1.8.5:
  annotate: use argv_array
  t7300: repair filesystem permissions with test_when_finished
  enums: remove trailing ',' after last item in enum
builtin/clean.c
pretty.c
t/t7300-clean.sh