git reset head -- hello.rb
added two files
Merge branch 'feature'

merge
master
this is really commit on feature
Merge branch 'feature'
feature
master
fixing
fixed
commit
del
Merge branch 'feature'

testing
test