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

	Commit message (Expand)	Author	Age
*	Make <identifier> lowercase as per CodingGuidelines	Michael J Gruber	2011-02-15
*	Merge branch 'jh/notes-merge'	Junio C Hamano	2010-12-08
\|\
\| *	Provide 'git notes get-ref' to easily retrieve current notes ref	Johan Herland	2010-11-17
\| *	git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"	Johan Herland	2010-11-17
\| *	git notes merge: --commit should fail if underlying notes ref has moved	Johan Herland	2010-11-17
\| *	git notes merge: List conflicting notes in notes merge commit message	Johan Herland	2010-11-17
\| *	git notes merge: Manual conflict resolution, part 2/2	Johan Herland	2010-11-17
\| *	git notes merge: Manual conflict resolution, part 1/2	Johan Herland	2010-11-17
\| *	git notes merge: Add automatic conflict resolvers (ours, theirs, union)	Johan Herland	2010-11-17
\| *	git notes merge: Handle real, non-conflicting notes merges	Johan Herland	2010-11-17
\| *	builtin/notes.c: Refactor creation of notes commits.	Johan Herland	2010-11-17
\| *	git notes merge: Initial implementation handling trivial merges only	Johan Herland	2010-11-17
\| *	builtin/notes.c: Split notes ref DWIMmery into a separate function	Johan Herland	2010-11-17
\| *	notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond	Johan Herland	2010-11-17
* \|	add OPT__FORCE	René Scharfe	2010-11-15
* \|	add description parameter to OPT__DRY_RUN	René Scharfe	2010-11-15
* \|	add description parameter to OPT__VERBOSE	René Scharfe	2010-11-15
* \|	notes: Don't create (empty) commit when removing non-existing notes	Johan Herland	2010-08-31
\|/
*	notes: allow --dry-run for -n and --verbose for -v	René Scharfe	2010-08-09
*	Merge branch 'maint'	Junio C Hamano	2010-06-28
\|\
\| *	notes: check number of parameters to "git notes copy"	Jeff King	2010-06-28
* \|	Merge branch 'maint'	Junio C Hamano	2010-06-25
\|\ \ \| \|/
\| *	msvc: Fix some "expr evaluates to function" compiler warnings	Ramsay Jones	2010-06-24
* \|	Merge 'maint' updates in	Junio C Hamano	2010-06-16
\|\ \ \| \|/
\| *	notes: Initialize variable to appease Sun Studio	Ævar Arnfjörð Bjarmason	2010-06-15
* \|	notes: dry-run and verbose options for prune	Michael J Gruber	2010-05-19
\|/
*	Merge branch 'sb/notes-parse-opt'	Junio C Hamano	2010-03-28
*	Merge branch 'tr/notes-display'	Junio C Hamano	2010-03-24
*	Merge branch 'jh/notes'	Junio C Hamano	2010-03-15