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

	Commit message (Expand)	Author	Age
*	Merge branch 'lt/objalloc'	Junio C Hamano	2007-04-21
\|\
\| *	Clean up object creation to use more common code	Linus Torvalds	2007-04-16
\| *	Use proper object allocators for unknown object nodes too	Linus Torvalds	2007-04-16
* \|	Merge branch 'jc/add'	Junio C Hamano	2007-04-21
\|\ \
\| * \|	git-add -u: match the index with working tree.	Junio C Hamano	2007-04-20
* \| \|	Merge branch 'jc/attr'	Junio C Hamano	2007-04-21
\|\ \ \
\| * \| \|	lockfile: record the primary process.	Junio C Hamano	2007-04-21
\| * \| \|	convert.c: restructure the attribute checking part.	Junio C Hamano	2007-04-21
\| * \| \|	Fix bogus linked-list management for user defined merge drivers.	Junio C Hamano	2007-04-21
\| * \| \|	Simplify calling of CR/LF conversion routines	Alex Riesen	2007-04-20
\| * \| \|	Document gitattributes(5)	Junio C Hamano	2007-04-19
\| * \| \|	Update 'crlf' attribute semantics.	Junio C Hamano	2007-04-19
\| * \| \|	Documentation: support manual section (5) - file formats.	Junio C Hamano	2007-04-19
\| * \| \|	Simplify code to find recursive merge driver.	Junio C Hamano	2007-04-18
\| * \| \|	Counto-fix in merge-recursive	Junio C Hamano	2007-04-18
\| * \| \|	Fix funny types used in attribute value representation	Junio C Hamano	2007-04-18
\| * \| \|	Allow low-level driver to specify different behaviour during internal merge.	Junio C Hamano	2007-04-18
\| * \| \|	Custom low-level merge driver: change the configuration scheme.	Junio C Hamano	2007-04-18
\| * \| \|	Allow the default low-level merge driver to be configured.	Junio C Hamano	2007-04-18
\| * \| \|	Custom low-level merge driver support.	Junio C Hamano	2007-04-18
\| * \| \|	Add a demonstration/test of customized merge.	Junio C Hamano	2007-04-17
\| * \| \|	Allow specifying specialized merge-backend per path.	Junio C Hamano	2007-04-17
\| * \| \|	merge-recursive: separate out xdl_merge() interface.	Junio C Hamano	2007-04-17
\| * \| \|	Allow more than true/false to attributes.	Junio C Hamano	2007-04-17
\| * \| \|	Document git-check-attr	James Bowes	2007-04-15
\| * \| \|	Change attribute negation marker from '!' to '-'.	Junio C Hamano	2007-04-15
\| * \| \|	Define a built-in attribute macro "binary".	Junio C Hamano	2007-04-15
\| * \| \|	attribute macro support	Junio C Hamano	2007-04-15
\| * \| \|	Makefile: add patch-ids.h back in.	Junio C Hamano	2007-04-15
\| * \| \|	Fix 'diff' attribute semantics.	Junio C Hamano	2007-04-15
\| * \| \|	Fix 'crlf' attribute semantics.	Junio C Hamano	2007-04-15
\| * \| \|	Teach 'diff' about 'diff' attribute.	Junio C Hamano	2007-04-14
\| * \| \|	Define 'crlf' attribute.	Junio C Hamano	2007-04-14
\| * \| \|	Add basic infrastructure to assign attributes to paths	Junio C Hamano	2007-04-14
* \| \| \|	Merge branch 'lt/gitlink'	Junio C Hamano	2007-04-21
\|\ \ \ \
\| * \| \| \|	Tests for core subproject support	Alex Riesen	2007-04-18
\| * \| \| \|	Expose subprojects as special files to "git diff" machinery	Linus Torvalds	2007-04-15
\| * \| \| \|	Fix some "git ls-files -o" fallout from gitlinks	Linus Torvalds	2007-04-14
\| * \| \| \|	Replace a pair of patches with updated ones for subproject support.	Junio C Hamano	2007-04-14
\| \|\ \ \ \
\| \| * \| \| \|	Teach "git-read-tree -u" to check out submodules as a directory	Linus Torvalds	2007-04-12
\| \| * \| \| \|	Teach git list-objects logic not to follow gitlinks	Linus Torvalds	2007-04-12
\| * \| \| \| \|	Teach "git-read-tree -u" to check out submodules as a directory	Linus Torvalds	2007-04-14
\| * \| \| \| \|	Teach git list-objects logic to not follow gitlinks	Linus Torvalds	2007-04-14
\| * \| \| \| \|	Fix gitlink index entry filesystem matching	Linus Torvalds	2007-04-14
\| \|/ / / /
\| * \| \| \|	Don't show gitlink directories when we want "other" files	Linus Torvalds	2007-04-12
\| * \| \| \|	Teach git-update-index about gitlinks	Linus Torvalds	2007-04-12
\| * \| \| \|	Teach directory traversal about subprojects	Linus Torvalds	2007-04-11
\| * \| \| \|	Fix thinko in subproject entry sorting	Linus Torvalds	2007-04-11
\| * \| \| \|	Teach core object handling functions about gitlinks	Linus Torvalds	2007-04-10
\| * \| \| \|	Teach "fsck" not to follow subproject links	Linus Torvalds	2007-04-10