tgif.git - Terin's Improved Git Fork

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