Add rebase with merge commit merge style (#3844)#4052

Merged

lafriks merged 16 commits into

go-gitea:masterfrom

apricote:rebase-merge-commit

Dec 27, 2018

Commits on May 26, 2018

add rebase with merge commit merge style (#3844)
apricote
committed

Commits on May 28, 2018

Merge branch 'master' into rebase-merge-commit
apricote
authored

Commits on Jul 23, 2018

Commits on Jul 24, 2018

enable RebaseMerge by default for new repositories
apricote
committed

Commits on Dec 9, 2018

Commits on Dec 10, 2018

remove test todo note
apricote
committed

Commits on Dec 11, 2018

Merge branch 'master' into rebase-merge-commit
lunny
authored

Commits on Dec 15, 2018

Commits on Dec 17, 2018

Merge branch 'master' into rebase-merge-commit
apricote
authored

Commits on Dec 18, 2018

Merge branch 'master' into rebase-merge-commit
lunny
authored

Commits on Dec 27, 2018