second commit-index.html
commit feature 1
commit feature 2
master changes
Merge branch 'feature1'
Merge branch 'feature2'
Revert "commit feature 1"

This reverts commit 178dc911ce4ddba461230e245df1f7f678ca7297.
Revert "commit feature 2"

This reverts commit 59aa4b40a6c8fb05e3c582e41d25f5adcc9cf971.
master bugfix
f2
f1
Merge branch 'feature1'
Merge branch 'feature2'
master