Commit #1 in some-feature
Commit #2 in some-feature
Merge branch 'master' into some-feature
Commit #3 in some-feature