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

	Commit message (Expand)	Author	Age	Files	Lines
*	rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summary	Ralf Thielow	2013-08-21	1	-0/+23
*	add tests for rebasing merged history	Martin von Zweigbergk	2013-06-07	1	-53/+0
*	rebase -i -p: include non-first-parent commits in todo list	Andrew Wong	2011-06-19	1	-1/+27
*	git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff	Andrew Wong	2011-04-28	1	-1/+31
*	Change incorrect "remote branch" to "remote tracking branch" in C code	Matthieu Moy	2010-11-03	1	-1/+1
*	tests: subshell indentation stylefix	Jonathan Nieder	2010-09-09	1	-6/+7
*	Several tests: cd inside subshell instead of around	Jens Lehmann	2010-09-06	1	-6/+6
*	t3409 t4107 t7406 t9150: use dashless commands	Matthew Ogilvie	2009-11-29	1	-3/+3
*	merge: indicate remote tracking branches in merge message	Jeff King	2009-08-09	1	-1/+1
*	rebase -i -p: leave a --cc patch when a merge could not be redone	Johannes Schindelin	2008-12-24	1	-0/+1
*	rebase -i -p: Fix --continue after a merge could not be redone	Johannes Sixt	2008-12-21	1	-1/+1
*	Show a failure of rebase -p if the merge had a conflict	Johannes Sixt	2008-12-21	1	-11/+44
*	rebase: Support preserving merges in non-interactive mode	Andreas Ericsson	2008-09-30	1	-0/+61