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

	Commit message (Expand)	Author	Age
*	Make "subtree" part more orthogonal to the rest of merge-recursive.	Junio C Hamano	2010-01-17
*	git merge -X<option>	Avery Pennarun	2010-01-17
*	merge-{recursive,subtree}: use usagef() to print usage	Jonathan Nieder	2009-11-10
*	MinGW: Fix compiler warning in merge-recursive	Johannes Schindelin	2009-05-23
*	remove trailing LF in die() messages	Alexander Potashev	2009-01-05
*	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
*	Revert "Convert output messages in merge-recursive to past tense."	Jonathan del Strother	2008-08-22
*	Rename path_list to string_list	Johannes Schindelin	2008-07-21
*	Merge branch 'rs/archive'	Junio C Hamano	2008-07-16
\|\
\| *	add context pointer to read_tree_recursive()	René Scharfe	2008-07-15
* \|	Move commit_list_count() to commit.c	Miklos Vajna	2008-06-30
\|/
*	clone: create intermediate directories of destination repo	Jeff King	2008-06-24
*	Merge branch 'js/merge-recursive'	Junio C Hamano	2008-06-09
\|\
\| *	merge-recursive: respect core.autocrlf when writing out the result	Johannes Schindelin	2008-06-09
* \|	Merge branch 'js/config-cb'v1.5.6-rc0	Junio C Hamano	2008-05-25
\|\ \
\| * \|	Provide git_config with a callback-data parameter	Johannes Schindelin	2008-05-14
\| \|/
* \|	diff: make "too many files" rename warning optional	Jeff King	2008-05-03
* \|	bump rename limit defaults	Jeff King	2008-05-03
* \|	add merge.renamelimit config option	Jeff King	2008-05-03
\|/
*	Merge branch 'maint'	Junio C Hamano	2008-03-14
*	Merge branch 'lt/unpack-trees'	Junio C Hamano	2008-03-11
\|\
\| *	Make 'unpack_trees()' have a separate source and destination index	Linus Torvalds	2008-03-09
\| *	Make 'unpack_trees()' take the index to work on as an argument	Linus Torvalds	2008-03-09
* \|	Merge branch 'jc/cherry-pick' (early part)	Junio C Hamano	2008-03-11
\|/
*	Merge branch 'db/checkout'	Junio C Hamano	2008-02-27
*	Library function to check for unmerged index entries	Daniel Barkalow	2008-02-09
*	Build-in merge-recursive	Daniel Barkalow	2008-02-09