git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'mv/merge-noff'	Junio C Hamano	2008-10-20	1	-0/+16
\|\
\| *	builtin-commit: use reduce_heads() only when appropriate	Miklos Vajna	2008-10-03	1	-0/+16
* \|	Merge branch 'maint'	Junio C Hamano	2008-10-17	1	-0/+24
\|\ \
\| * \|	Add testcase to ensure merging an early part of a branch is done properly	Miklos Vajna	2008-10-15	1	-0/+26
* \| \|	builtin-merge: refresh the index before calling a strategy	Miklos Vajna	2008-10-03	1	-0/+9
\| \|/ \|/\|
* \|	Merge branch 'maint'	Junio C Hamano	2008-09-04	1	-1/+1
\|\\|
\| *	tests: use "git xyzzy" form (t7200 - t9001)	Nanako Shiraishi	2008-09-03	1	-1/+1
* \|	Merge branch 'mv/merge-custom'	Junio C Hamano	2008-08-28	1	-0/+4
\|\ \ \| \|/ \|/\|
\| *	Add a second testcase for handling invalid strategies in git-merge	Miklos Vajna	2008-07-30	1	-0/+4
* \|	merge: fix numerus bugs around "trivial merge" area	Junio C Hamano	2008-08-24	1	-0/+9
* \|	"git-merge": allow fast-forwarding in a stat-dirty tree	Junio C Hamano	2008-08-21	1	-0/+10
\|/
*	builtin-merge.c: Fix option parsing	Michele Ballabio	2008-07-20	1	-1/+1
*	Merge branch 'sb/dashless'	Junio C Hamano	2008-07-17	1	-1/+1
\|\
\| *	t/: Use "test_must_fail git" instead of "! git"	Stephan Beyer	2008-07-13	1	-1/+1
* \|	Merge branch 'maint'	Junio C Hamano	2008-07-17	1	-31/+7
\|\ \
\| * \|	t7600-merge: Use test_expect_failure to test option parsing	Johannes Sixt	2008-07-16	1	-30/+6
\| \|/
* \|	reduce_heads(): protect from duplicate input	Junio C Hamano	2008-07-14	1	-0/+22
* \|	reduce_heads(): thinkofix	Sverre Hvammen Johansen	2008-07-13	1	-0/+11
* \|	Teach merge.log to "git-merge" again	Junio C Hamano	2008-07-10	1	-0/+7
\|/
*	merge, pull: add '--(no-)log' command line option	SZEDER Gábor	2008-04-13	1	-1/+15
*	merge, pull: introduce '--(no-)stat' option	SZEDER Gábor	2008-04-13	1	-4/+19
*	add test_cmp function for test scripts	Jeff King	2008-03-13	1	-1/+1
*	remove use of "tail -n 1" and "tail -1"	Jeff King	2008-03-13	1	-1/+1
*	grep portability fix: don't use "-e" or "-q"	Jeff King	2008-03-13	1	-2/+2
*	git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options	Gerrit Pape	2008-03-03	1	-0/+6
*	t/t7600: avoid GNUism in grep	Junio C Hamano	2008-01-05	1	-2/+2
*	git-merge: add --ff and --no-ff options	Lars Hjemli	2007-09-24	1	-0/+20
*	git-merge: add support for --commit and --no-squash	Lars Hjemli	2007-09-24	1	-0/+22
*	git-merge: add support for branch.<name>.mergeoptions	Lars Hjemli	2007-09-24	1	-0/+54
*	Add test-script for git-merge porcelain	Lars Hjemli	2007-09-24	1	-0/+344