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

	Commit message (Expand)	Author	Age	Files	Lines
*	Move create_notes_commit() from notes-merge.c into notes-utils.c	Johan Herland	2013-06-12	1	-26/+1
*	Merge branch 'tr/void-diff-setup-done'	Junio C Hamano	2012-08-22	1	-4/+2
\|\
\| *	diff_setup_done(): return void	Thomas Rast	2012-08-03	1	-4/+2
* \|	notes-merge: remove i18n legos in merge result message	Nguyễn Thái Ngọc Duy	2012-06-07	1	-2/+4
* \|	notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktree	Johan Herland	2012-03-15	1	-4/+9
* \|	notes-merge: use opendir/readdir instead of using read_directory()	Johan Herland	2012-03-15	1	-20/+30
\|/
*	Merge branch 'jc/show-sig'	Junio C Hamano	2012-01-06	1	-1/+1
\|\
\| *	commit: teach --gpg-sign option	Junio C Hamano	2011-11-12	1	-1/+1
* \|	Merge branch 'nd/war-on-nul-in-commit'	Junio C Hamano	2011-12-22	1	-4/+6
\|\ \
\| * \|	Convert commit_tree() to take strbuf as message	Nguyễn Thái Ngọc Duy	2011-12-15	1	-4/+6
* \| \|	Merge branch 'nd/resolve-ref'	Junio C Hamano	2011-12-09	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Convert many resolve_ref() calls to read_ref*() and ref_exists()	Nguyễn Thái Ngọc Duy	2011-11-13	1	-1/+1
\| \|/
* \|	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