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

	Commit message (Expand)	Author	Age	Files	Lines
*	notes: extract enum notes_merge_strategy to notes-utils.h	Jacob Keller	2015-08-17	1	-7/+3
*	Move create_notes_commit() from notes-merge.c into notes-utils.c	Johan Herland	2013-06-12	1	-14/+0
*	Convert commit_tree() to take strbuf as message	Nguyễn Thái Ngọc Duy	2011-12-15	1	-1/+1
*	git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"	Johan Herland	2010-11-17	1	-1/+2
*	git notes merge: List conflicting notes in notes merge commit message	Johan Herland	2010-11-17	1	-1/+1
*	git notes merge: Manual conflict resolution, part 2/2	Johan Herland	2010-11-17	1	-0/+23
*	git notes merge: Manual conflict resolution, part 1/2	Johan Herland	2010-11-17	1	-1/+10
*	git notes merge: Add automatic conflict resolvers (ours, theirs, union)	Johan Herland	2010-11-17	1	-0/+6
*	git notes merge: Handle real, non-conflicting notes merges	Johan Herland	2010-11-17	1	-3/+12
*	builtin/notes.c: Refactor creation of notes commits.	Johan Herland	2010-11-17	1	-0/+14
*	git notes merge: Initial implementation handling trivial merges only	Johan Herland	2010-11-17	1	-0/+36