delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Sync with 1.7.7.4	Junio C Hamano	2011-11-18	1	-43/+61
\|\
\| *	Merge branch 'jn/maint-notes-avoid-va-args' into maint	Junio C Hamano	2011-11-18	1	-43/+61
\| \|\
\| \| *	notes merge: eliminate OUTPUT macrojn/maint-notes-avoid-va-args	Jonathan Nieder	2011-11-17	1	-43/+61
* \| \|	Merge branch 'mh/maint-notes-merge-pathbuf-fix'	Junio C Hamano	2011-10-10	1	-1/+2
\|\ \ \ \| \|/ /
\| * \|	notes_merge_commit(): do not pass temporary buffer to other function	Michael Haggerty	2011-09-27	1	-1/+2
* \| \|	Change check_ref_format() to take a flags argument	Michael Haggerty	2011-10-05	1	-2/+3
\|/ /
* \|	index_fd(): turn write_object and format_check arguments into one flag	Junio C Hamano	2011-05-09	1	-1/+1
* \|	Fix sparse warnings	Stephen Boyd	2011-03-22	1	-1/+1
\|/
*	correct type of EMPTY_TREE_SHA1_BIN	Jonathan Nieder	2011-02-14	1	-1/+1
*	git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"	Johan Herland	2010-11-17	1	-0/+7
*	git notes merge: List conflicting notes in notes merge commit message	Johan Herland	2010-11-17	1	-1/+10
*	git notes merge: Manual conflict resolution, part 2/2	Johan Herland	2010-11-17	1	-1/+70
*	git notes merge: Manual conflict resolution, part 1/2	Johan Herland	2010-11-17	1	-5/+161
*	git notes merge: Add automatic conflict resolvers (ours, theirs, union)	Johan Herland	2010-11-17	1	-1/+31
*	git notes merge: Handle real, non-conflicting notes merges	Johan Herland	2010-11-17	1	-3/+322
*	builtin/notes.c: Refactor creation of notes commits.	Johan Herland	2010-11-17	1	-0/+27
*	git notes merge: Initial implementation handling trivial merges only	Johan Herland	2010-11-17	1	-0/+120