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

	Commit message (Expand)	Author	Age
*	Merge branch 'dg/local-mod-error-messages'	Junio C Hamano	2010-09-03
\|\
\| *	Move "show_all_errors = 1" to setup_unpack_trees_porcelain()	Matthieu Moy	2010-09-03
\| *	setup_unpack_trees_porcelain: take the whole options struct as parameter	Matthieu Moy	2010-09-03
\| *	Move set_porcelain_error_msgs to unpack-trees.c and rename it	Matthieu Moy	2010-09-03
* \|	Merge branch 'nd/fix-sparse-checkout'	Junio C Hamano	2010-08-21
\|\ \
\| * \|	unpack-trees: mark new entries skip-worktree appropriately	Nguyễn Thái Ngọc Duy	2010-08-09
\| * \|	unpack-trees: do not check for conflict entries too early	Nguyễn Thái Ngọc Duy	2010-08-09
\| * \|	unpack-trees: let read-tree -u remove index entries outside sparse area	Nguyễn Thái Ngọc Duy	2010-08-09
\| * \|	unpack-trees: only clear CE_UPDATE\|CE_REMOVE when skip-worktree is always set	Nguyễn Thái Ngọc Duy	2010-08-09
* \| \|	Merge branch 'dg/local-mod-error-messages'	Junio C Hamano	2010-08-21
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	unpack_trees: group error messages by type	Matthieu Moy	2010-08-11
\| * \|	merge-recursive: distinguish "removed" and "overwritten" messages	Matthieu Moy	2010-08-11
\| * \|	merge-recursive: porcelain messages for checkout	Diane Gasselin	2010-08-11
\| * \|	Turn unpack_trees_options.msgs into an array + enum	Matthieu Moy	2010-08-11
* \| \|	read-tree: stop leaking tree objects	Jonathan Nieder	2010-08-11
\|/ /
* \|	Merge branch 'bd/maint-unpack-trees-parawalk-fix'	Junio C Hamano	2010-06-22
\|\ \
\| * \|	unpack-trees: Make index lookahead less pessimal	Brian Downing	2010-06-18
\| \|/
* \|	Merge branch 'gv/portable'	Junio C Hamano	2010-06-21
\|\ \
\| * \|	Rewrite dynamic structure initializations to runtime assignment	Gary V. Vaughan	2010-05-31
\| \|/
* \|	Merge branch 'cb/assume-unchanged-fix'	Junio C Hamano	2010-06-13
\|\ \
\| * \|	do not overwrite files marked "assume unchanged"	Clemens Buchacher	2010-05-01
\| \|/
* \|	Introduce remove_or_warn function	Peter Collingbourne	2010-03-28
\|/
*	Merge branch 'jc/fix-tree-walk'	Junio C Hamano	2010-01-24
\|\
\| *	read-tree --debug-unpack	Junio C Hamano	2010-01-07
\| *	unpack-trees.c: look ahead in the index	Junio C Hamano	2010-01-07
\| *	unpack-trees.c: prepare for looking ahead in the index	Junio C Hamano	2010-01-07
\| *	Aggressive three-way merge: fix D/F case	Junio C Hamano	2010-01-03
* \|	Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'	Junio C Hamano	2010-01-18
\|\ \
\| * \|	Remove empty directories when checking out a commit with fewer submodules	Peter Collingbourne	2010-01-11
\| \|/
* \|	Merge branch 'cc/reset-more'	Junio C Hamano	2010-01-13
\|\ \
\| * \|	"reset --merge": fix unmerged case	Junio C Hamano	2010-01-03
\| \|/
* \|	Merge branch 'nd/sparse'	Junio C Hamano	2010-01-13
\|\ \ \| \|/ \|/\|
\| *	ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID	Nguyễn Thái Ngọc Duy	2009-12-14
\| *	sparse checkout: inhibit empty worktree	Nguyễn Thái Ngọc Duy	2009-08-23
\| *	unpack-trees(): ignore worktree check outside checkout area	Nguyễn Thái Ngọc Duy	2009-08-23
\| *	unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index	Nguyễn Thái Ngọc Duy	2009-08-23
\| *	unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout	Nguyễn Thái Ngọc Duy	2009-08-23
\| *	unpack-trees.c: generalize verify_* functions	Nguyễn Thái Ngọc Duy	2009-08-23
\| *	unpack-trees(): add CE_WT_REMOVE to remove on worktree alone	Nguyễn Thái Ngọc Duy	2009-08-23
\| *	unpack-trees(): carry skip-worktree bit over in merged_entry()	Nguyễn Thái Ngọc Duy	2009-08-23
\| *	Teach Git to respect skip-worktree bit (writing part)	Nguyễn Thái Ngọc Duy	2009-08-23
* \|	Merge branch 'jc/fix-tree-walk' (early part)	Junio C Hamano	2009-11-20
\|\ \
\| * \|	unpack_callback(): use unpack_failed() consistently	Junio C Hamano	2009-10-11
\| * \|	unpack-trees: typofix	Junio C Hamano	2009-10-11
\| \|/
* \|	Use 'fast-forward' all over the place	Felipe Contreras	2009-10-24
\|/
*	Merge branch 'maint'	Junio C Hamano	2009-07-18
\|\
\| *	checkout -f: deal with a D/F conflict entry correctly	Junio C Hamano	2009-07-18
* \|	Fix extraneous lstat's in 'git checkout -f'	Linus Torvalds	2009-07-14
* \|	unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5	Brandon Casey	2009-07-10
* \|	Simplify read_directory[_recursive]() arguments	Linus Torvalds	2009-07-09