Merging from local commits: up-to-date

Question

I have master repository at server and i have local clone from this.

I do at local: change test.txt

git add test.txt
git commit -m 'test'
git push origin master

after this i dont see changes at test.txt. at git status i see

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    modified:   test.txt

i try

git merge _commitname

and see:

Already up-to-date.

thanks in advance and sorry for bad english.

UPD

git version 1.8.5.3 – at server
git version 1.8.5.2.msysgit – at client

diff:

--- test.txt 
+++ test.txt 
...[characters from test.txt]

Answer 1

The issue seems to be seen on the destination, that is the server side.

The OP don't see the modification on the server side either because because:

• the destination repo is non-bare (in which case the working tree isn't updated)
• the destination repo is bare (in which case there is no file to see since it is a repo without working tree)
  That last case is usually completed by a post-receive hook in order to checkout that repo in a separate folder, in order to see what has just been pushed.

Answer 2

It was non-bare repository with 1 branch (master)

i created new branch

git branch new

push commit from local repository

git push origin master:new

and do merge

git merge new