Re: How to do a fast-forward merge without a checkout?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Jul 18, 2011 at 4:18 PM, Patrick Doyle <wpdster@xxxxxxxxx> 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!
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]