git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Carlo Trimarchi <mr.spoon21@gmail.com>
To: Massimo Manca <massimo.manca@micronengineering.it>, git@vger.kernel.org
Subject: Re: pushing a branch without merging
Date: Mon, 20 Jun 2011 16:56:12 +0200	[thread overview]
Message-ID: <BANLkTikWDzZD8b-aUMXJwByeN3tBsYipgQ@mail.gmail.com> (raw)
In-Reply-To: <4DFF5B41.1000108@micronengineering.it>

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

> 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.

  parent reply	other threads:[~2011-06-20 14:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-20 14:11 pushing a branch without merging Carlo Trimarchi
     [not found] ` <4DFF5B41.1000108@micronengineering.it>
2011-06-20 14:56   ` Carlo Trimarchi [this message]
2011-06-20 15:03     ` Carlos Martín Nieto
2011-06-20 15:51       ` PJ Weisberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BANLkTikWDzZD8b-aUMXJwByeN3tBsYipgQ@mail.gmail.com \
    --to=mr.spoon21@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=massimo.manca@micronengineering.it \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).