commit #2 adding feature1.txt in feature
commit #4 added lines to feature1.txt and file1.txt in feature
commit #3 adding a line to file1.txt in master
rebase

Squashed commits #5 and #2 changing feature1.txt

adding a second line to feature1.txt in feature
rebase commit #4 added lines to feature1.txt and file1.txt in feature
Merge branch 'feature'