gistfile1.txt

fnord0@spaceface ~/devel/github/archassault (git)-[testing] % git push origin
Password for 'https://[email protected]': 
Counting objects: 12, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 820 bytes | 0 bytes/s, done.
Total 6 (delta 3), reused 0 (delta 0)
To https://[email protected]/archassault/archassault.git
   1248232..b178cba  testing -> testing
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://[email protected]/archassault/archassault.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. If you did not intend to push that branch, you may want to
hint: specify branches to push or set the 'push.default' configuration variable
hint: to 'simple', 'current' or 'upstream' to push only the current branch.