Adding commit-merge.txt to feature-branch-merge branch.
Creating a file commit-rebase.txt.
Merge branch 'feature-branch-merge'

This is 2) in the Merging section of the git-flow assignment.
Pushing up the hand-drawn diagram of my git commits.