git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 341e7e8 45067fc)

author	Junio C Hamano <redacted>
	Wed, 2 Jul 2014 19:51:50 +0000 (12:51 -0700)
committer	Junio C Hamano <redacted>
	Wed, 2 Jul 2014 19:51:50 +0000 (12:51 -0700)
commit	c2f7b1026e33e308782fcb1b60e3d7af107fdc18
tree	8768ef958c9dea375afcada68df1d0f1ae6d59c3	tree \| snapshot
parent	341e7e8eda3dbeb6867f4f8f45b671201b807de5	commit \| diff
parent	45067fc973c31953ab283f77f0f91eba9a272624	commit \| diff

Merge branch 'maint-1.8.5' into maint

* maint-1.8.5:
t7300: repair filesystem permissions with test_when_finished
enums: remove trailing ',' after last item in enum

builtin/clean.c	diff1 \|	diff2 \|	blob \| history
pretty.c	diff1 \|	diff2 \|	blob \| history
t/t7300-clean.sh	diff1 \|	diff2 \|	blob \| history

git clone https://git.99rst.org/PROJECT