git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Expand)	Author
2010-09-04	Merge branch 'dg/local-mod-error-messages'	Junio C Hamano
2010-09-03	Merge branch 'jn/merge-custom-no-trivial'	Junio C Hamano
2010-09-03	Merge branch 'jn/update-contrib-example-merge'	Junio C Hamano
2010-09-03	Merge branch 'jn/merge-renormalize'	Junio C Hamano
2010-09-03	Move "show_all_errors = 1" to setup_unpack_trees_porcelain()	Matthieu Moy
2010-09-03	setup_unpack_trees_porcelain: take the whole options struct as parameter	Matthieu Moy
2010-09-03	Move set_porcelain_error_msgs to unpack-trees.c and rename it	Matthieu Moy
2010-08-22	Merge branch 'gb/split-cmdline-errmsg'	Junio C Hamano
2010-08-19	merge: do not mistake (ancestor of) tag for branch	Jonathan Nieder
2010-08-16	merge: let custom strategies intervene in trivial merges	Jonathan Nieder
2010-08-11	unpack_trees: group error messages by type	Matthieu Moy
2010-08-11	merge-recursive: porcelain messages for checkout	Diane Gasselin
2010-08-11	Turn unpack_trees_options.msgs into an array + enum	Matthieu Moy
2010-08-11	split_cmdline: Allow caller to access error string	Greg Brockman
2010-08-06	merge-recursive --renormalize	Jonathan Nieder
2010-07-03	Avoid conflicts when merging branches with mixed normalization	Eyvind Bernhardsen
2010-06-18	Merge branch 'tc/merge-m-log'	Junio C Hamano
2010-05-10	merge: --log appends shortlog to message if specified	Tay Ray Chuan
2010-05-10	merge: rename variable	Tay Ray Chuan
2010-05-10	merge: update comment	Tay Ray Chuan
2010-05-09	Merge branch 'cc/revert-strategy'	Junio C Hamano
2010-04-01	merge: make function try_merge_command non static	Christian Couder
2010-04-01	merge: refactor code that calls "git merge-STRATEGY"	Christian Couder
2010-03-29	Merge branch 'cc/cherry-pick-ff'	Junio C Hamano
2010-02-23	Move 'builtin-*' into a 'builtin/' subdirectory	Linus Torvalds