commit fileone.txt
my commit message
Merge branch 'master' of github.com:kenlintw/repo001

to fix 'no tracking information for current branch' after issuing 'git push'