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

	Commit message (Expand)	Author	Age
*	Merge branch 'js/maint-merge-recursive-r-d-conflict'	Junio C Hamano	2009-01-07
\|\
\| *	merge-recursive: mark rename/delete conflict as unmerged	Johannes Schindelin	2008-12-24
* \|	Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix	Junio C Hamano	2008-12-15
\|\ \ \| \|/ \|/\|
* \|	Report symlink failures in merge-recursive	Alex Riesen	2008-12-04
* \|	merge-recursive: use strbuf_expand() instead of interpolate()	René Scharfe	2008-11-23
* \|	git-merge-recursive: honor merge.conflictstyle once again	Matt McCutchen	2008-10-19
* \|	Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer	Brandon Casey	2008-10-12
* \|	Merge branch 'bc/master-diff-hunk-header-fix'	Shawn O. Pearce	2008-09-29
\|\ \ \| \|/
* \|	Merge branch 'maint'	Shawn O. Pearce	2008-09-26
\|\ \ \| \|/
* \|	Cleanup remove_path	Alex Riesen	2008-09-26
* \|	merge-recursive: get rid of virtual_id	Miklos Vajna	2008-09-05
* \|	merge-recursive: move current_{file,directory}_set to struct merge_options	Miklos Vajna	2008-09-04
* \|	merge-recursive: move the global obuf to struct merge_options	Miklos Vajna	2008-09-04
* \|	merge-recursive: get rid of the index_only global variable	Miklos Vajna	2008-09-04
* \|	merge-recursive: move call_depth to struct merge_options	Miklos Vajna	2008-09-03
* \|	merge-recursive: introduce merge_options	Miklos Vajna	2008-08-30
* \|	merge-recursive.c: Add more generic merge_recursive_generic()	Stephan Beyer	2008-08-30
* \|	Split out merge_recursive() to merge-recursive.c	Miklos Vajna	2008-08-30
\|/
*	Build-in merge-recursive	Daniel Barkalow	2008-02-09
*	Make on-disk index representation separate from in-core one	Linus Torvalds	2008-01-21
*	Improve use of lockfile API	Brandon Casey	2008-01-16
*	Fix grammar nits in documentation and in code comments.	Jim Meyering	2008-01-03
*	Improved submodule merge support	Finn Arne Gangstad	2007-12-19
*	Support a merge with conflicting gitlink change	Junio C Hamano	2007-12-11
*	Make the diff_options bitfields be an unsigned with explicit masks.	Pierre Habouzit	2007-11-11
*	Merge branch 'maint'	Junio C Hamano	2007-10-29
\|\
\| *	merge-recursive.c: mrtree in merge() is not used before set	Junio C Hamano	2007-10-29
\| *	Move make_cache_entry() from merge-recursive.c into read-cache.c	Carlos Rica	2007-09-26
* \|	Merge branch 'ph/strbuf'	Junio C Hamano	2007-10-03
\|\ \
\| * \|	nfv?asprintf are broken without va_copy, workaround them.	Pierre Habouzit	2007-09-20
\| * \|	Use xmemdupz() in many places.	Pierre Habouzit	2007-09-18
* \| \|	Make merge-recursive honor diff.renamelimit	Lars Hjemli	2007-09-25
\|/ /
* \|	Move make_cache_entry() from merge-recursive.c into read-cache.c	Carlos Rica	2007-09-12
\|/
*	Use xmkstemp() instead of mkstemp()	Luiz Fernando N. Capitulino	2007-08-14
*	merge-recursive: do not rudely die on binary merge	Junio C Hamano	2007-08-14
*	Start moving unpack-trees to "struct tree_desc"	Linus Torvalds	2007-08-10
*	-Wold-style-definition fix	Junio C Hamano	2007-06-13
*	merge-recursive: refuse to merge binary files	Johannes Schindelin	2007-06-04
*	Ignore merged status of the file-level merge	Alex Riesen	2007-04-26
*	Add a test for merging changed and rename-changed branches	Alex Riesen	2007-04-25
*	Avoid excessive rewrites in merge-recursive	Alex Riesen	2007-04-25
*	Merge branch 'jc/attr'	Junio C Hamano	2007-04-21
\|\
\| *	Fix bogus linked-list management for user defined merge drivers.	Junio C Hamano	2007-04-21
\| *	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