Re: pushing a branch without merging

From: Carlo Trimarchi <mr.spoon21@gmail.com>
Date: Jun 20, 2011, 14:56 UTC
Message-ID: <BANLkTikWDzZD8b-aUMXJwByeN3tBsYipgQ@mail.gmail.com>
In-Reply-To: <4DFF5B41.1000108@micronengineering.it>

2011/6/20 Massimo Manca <massimo.manca@micronengineering.it>:

Show 8 quoted lines

> then you edit and add files on the newly branch, so as usually you have
> to use:
>    git add .
>    git commit -m "what I change on this branch" -a
>
> When you have to update the remote then staying on experimental branch
> you can:
>    git push

This is exactly what I did, but on the server it showed the old version. This is what appears when commiting:

➜  website git:(experimental) ✗ git commit -a -m "commit message"
[mario_style 7764c96] commit message
 2 files changed, 315 insertions(+), 204 deletions(-)
 rewrite index.html (88%)
➜  website git:(experimental) ✗ git push website
Counting objects: 7, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 451 bytes, done.
Total 4 (delta 2), reused 0 (delta 0)
To ssh://myserver.bla.com/home/user/website.git
   f93d62f..eb8e369  master -> master

I'm in the experimental branch, but in the end it shows master -> master. Maybe that is what it is supposed to show, not sure.