git rebase

gistfile1.sh

☁  bugswarm-developers [master] vim package.json 
☁  bugswarm-developers [master] ⚡ git add package.json 
☁  bugswarm-developers [master] ⚡ git commit -m 'explicitly add new files'
[master b3a9612] explicitly add new files
 1 files changed, 1 insertions(+), 1 deletions(-)
☁  bugswarm-developers [master] git push
To git@github.com:buglabs/bugswarm-developers.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:buglabs/bugswarm-developers.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
☁  bugswarm-developers [master] git pull --rebase
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 3 (delta 2), reused 3 (delta 2)
Unpacking objects: 100% (3/3), done.
From github.com:buglabs/bugswarm-developers
   c62b1a6..d413ee1  gh-pages   -> origin/gh-pages
First, rewinding head to replay your work on top of it...
Applying: add google verification
Applying: explicitly add new files
☁  bugswarm-developers [master] git push         
Counting objects: 8, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 673 bytes, done.
Total 6 (delta 4), reused 0 (delta 0)
To git@github.com:buglabs/bugswarm-developers.git
   6d24597..7fc67df  master -> master
☁  bugswarm-developers [master]