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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'pw/rebase-i-merge-segv-fix'	Junio C Hamano	2018-08-20	1	-7/+23
\|\
\| *	rebase -i: fix SIGSEGV when 'merge <branch>' fails	Phillip Wood	2018-08-16	1	-1/+14
\| *	t3430: add conflicting commit	Phillip Wood	2018-08-16	1	-6/+9
* \|	rebase --exec: make it work with --rebase-merges	Johannes Schindelin	2018-08-09	1	-1/+1
* \|	t3430: demonstrate what -r, --autosquash & --exec should do	Johannes Schindelin	2018-08-06	1	-0/+17
* \|	rebase --rebase-merges: add support for octopus merges	Johannes Schindelin	2018-07-11	1	-0/+34
\|/
*	Merge branch 'bc/t3430-fixup'	Junio C Hamano	2018-06-04	1	-3/+2
\|\
\| *	t3430: test clean-up	brian m. carlson	2018-06-04	1	-3/+2
* \|	Merge branch 'js/rebase-recreate-merge'	Junio C Hamano	2018-06-01	1	-0/+17
\|\ \ \| \|/
\| *	sequencer: ensure labels that are object IDs are rewritten	brian m. carlson	2018-05-30	1	-0/+17
* \|	rebase --rebase-merges: root commits can be cousins, too	Johannes Schindelin	2018-05-06	1	-0/+25
* \|	rebase --rebase-merges: a "merge" into a new root is a fast-forward	Johannes Schindelin	2018-05-06	1	-0/+13
* \|	sequencer: allow introducing new root commits	Johannes Schindelin	2018-05-06	1	-0/+34
\|/
*	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	Johannes Schindelin	2018-04-26	1	-0/+18
*	rebase --rebase-merges: avoid "empty merges"	Johannes Schindelin	2018-04-26	1	-0/+8
*	sequencer: handle post-rewrite for merge commands	Johannes Schindelin	2018-04-26	1	-0/+25
*	sequencer: make refs generated by the `label` command worktree-local	Johannes Schindelin	2018-04-26	1	-0/+14
*	rebase: introduce the --rebase-merges option	Johannes Schindelin	2018-04-26	1	-0/+179