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

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