Merge commit 'diffstat-newgone' into inst
Merge commit 'send-email-coloring' into inst
Merge commit 'unpack-trees-overwrite-same-content' into inst
Merge commit 'commit-scissors' into inst

Conflicts:
	t/t7102-reset.sh
Merge commit 'tag-version-sort' into inst
Merge commit '92f3a03' into inst
Merge commit 'rebase' into inst

Conflicts:
	git-rebase.sh
Merge remote-tracking branch 'github/multiple-work-trees' into inst

Conflicts:
	builtin/repack.c