From: knittl <knittl89@googlemail.com>
Date: Mon, 18 Jul 2011 16:08:16 GMT
Subject: Re: How to do a fast-forward merge without a checkout?
Message-ID: <CACx-yZ1H5UfA9SeaGy-Ph+20BEsewJe7_78wQsr92Y09skSWHA@mail.gmail.com>
In-Reply-To: <CAF_dkJCvtVqoDmRXMy23ZnZL6iUAVX0nNA9Ev6e4zvBp9mfTpg@mail.gmail.com>

On Mon, Jul 18, 2011 at 4:18 PM, Patrick Doyle <wpdster@gmail.com> wrote:
> […]
>
> $ git push
> […]
> To somehost:path/to/repo
>   e1004df..bad8767  wpd -> wpd
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 'somehost:path/to/repo'
> 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.
>

another way to avoid pushing the master branch is to explicitely name
the branch to push (wpd):

    $ git push origin wpd

cheers, daniel

-- 
typed with http://neo-layout.org
myFtPhp -- visit http://myftphp.sf.net -- v. 0.4.7 released!