git pull always results in a merge

Question

I have an issue in which whenever I run git pull in my production server, it will result in a merge.

If I run git status, I get the following output:

$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 351 commits.
#   (use "git push" to publish your local commits)
#
nothing to commit, working directory clean

Ok, so there are 351 local commits. But git diff doesn't show any local changes:

$ git diff origin/master..HEAD
(no output)

If I use git log origin/master..HEAD, I only see messages like "Merge branch 'master' of ****".

Any ideas about how can I get rid of those 351 local commits which seems to be useless?

Answer 1

First of all, just in case, let's create a backup of your current branch:

git branch master-bak

If git diff origin/master..HEAD gives empty output, that means your current branch has identical content as origin/master. In which case, you can simply reset your local branch to the same state as origin/master:

git reset origin/master

Answer 2

Obviously you are not working alone so someone did a forced push (your local repo has different history from the remote), after which everyone else should do git reset --hard origin/master, so as to keep the same history with the origin/master.