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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 2c697a6 329b26e)

author	Junio C Hamano <redacted>
	Mon, 22 Apr 2013 18:26:56 +0000 (11:26 -0700)
committer	Junio C Hamano <redacted>
	Mon, 22 Apr 2013 18:26:56 +0000 (11:26 -0700)
commit	21247455f328fcf26fc4f78134bcc6f8a676fa8a
tree	e2ffee5d17870e5cfd69fb0e915a3568c42dfd33	tree \| snapshot
parent	2c697a67b14d432b844e996243633711ef5f4b32	commit \| diff
parent	329b26e0b4b2574960ee703eccdb0a7126a60505	commit \| diff

Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint

* jc/apply-ws-fix-tab-in-indent:
test: resurrect q_to_tab
apply --whitespace=fix: avoid running over the postimage buffer

builtin/apply.c	diff1 \|	diff2 \|	blob \| history
t/t4124-apply-ws-rule.sh	diff1 \|	diff2 \|	blob \| history
t/test-lib-functions.sh	diff1 \|	diff2 \|	blob \| history

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