first commit in bug-fixing branch
new commit to bug-fixing branch
from stashed to master
bug 123
added to bug_fixing branch
to master
Merge branch 'bug123'
Merge branch 'bug_fixing'
featureX
modified in featureX
moved down
deleted for