org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	Merge branch 'jc/fix-diff-files-unmerged'	Junio C Hamano	2011-05-06
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* jc/fix-diff-files-unmerged: diff-files: show unmerged entries correctly diff: remove often unused parameters from diff_unmerge() diff.c: return filepair from diff_unmerge() test: use $_z40 from test-lib
\| *	test: use $_z40 from test-lib	Junio C Hamano	2011-04-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is no need to duplicate the definition of $_z40 and $_x40 that test-lib.sh supplies the test scripts. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \|	i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, ↵	Junio C Hamano	2011-04-13
\| \| \| \| \| \| \| \| \| \| \| \|	t7012 and t7060 Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \|	i18n: git-clean basic messages	Ævar Arnfjörð Bjarmason	2011-03-09
\|/ \| \| \| \|	Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	t7012: Mark missing tests as TODO	Michael J Gruber	2010-04-19
\| \| \| \| \| \| \| \| \| \| \|	Currently, there are 6 tests which are not even written but are 'test_expect_failure message false'. Do not abuse test_expect_failure as a to do marker, but mark them as '#TODO' instead. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Teach Git to respect skip-worktree bit (writing part)	Nguyễn Thái Ngọc Duy	2009-08-23
	This part is mainly to remove CE_VALID shortcuts (and as a consequence, ce_uptodate() shortcuts as it may be turned on by CE_VALID) in writing code path if skip-worktree is used. Various tests are added to avoid future breakages. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>