Git failed

$ git push
To jonny@egw:radtek.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'jonny@egw:radtek.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.

$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:
    [branch "master"]
    remote = <nickname>
    merge = <remote-ref>

    [remote "<nickname>"]
    url = <url>
    fetch = <refspec>

See git-config(1) for details.

-- solution by zeroplex --

$ git pull origin master:tmp
From egw:radtek
 * [new branch]      master     -> tmp
Merge made by the 'recursive' strategy.
 src/bash/ins/db-check-ins113.sh |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)
 create mode 100755 src/bash/ins/db-check-ins113.sh

$ git checkout master
M   README
Already on 'master'

$ git merge tmp
Already up-to-date.

$ git branch -D tmp
Deleted branch tmp (was b2e66be).

$ git push orig
fatal: 'orig' does not appear to be a git repository
fatal: The remote end hung up unexpectedly

$ git push origin
Counting objects: 21, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (14/14), done.
Writing objects: 100% (14/14), 1.44 KiB, done.
Total 14 (delta 9), reused 0 (delta 0)
To jonny@egw:radtek.git
   b2e66be..b166790  master -> master

-- solution by chusiang --

$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#   modified:   ../../README
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#   ../../configure/apache/include/commit-c77a7ba
no changes added to commit (use "git add" and/or "git commit -a")

$ git commit -a

$ git add ../../READM

$ git commit -m "fix"

$ git push

Done!