How to tell what files on remote repository changed since last git pull?
I'm trying to push some code using $git push origin master but I get the
error
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/'
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.
When I did $ git fetch origin master then $ git diff maser origin/master I
got a list of all the files and changes that were different between the
two repos. However I am only interested in the list of files that have
changed between the remote repository and the last time I did a $ git pull
origin master on my local box.
Is there a way I can do this?
No comments:
Post a Comment