gistfile1.sh

(issue-12)jj@im-jj:~/demo$ git checkout master 
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 1 commit. # <-- Always be 1 commit ahead.
(master)jj@im-jj:~/demo$ git merge issue-12 
Updating c348893..d0e9912
Fast forward
 feature.py   |    3 +++
 testfile.txt |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)
 delete mode 100644 README.txt
 create mode 100644 feature.py
 create mode 100644 testfile.txt