all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: phillip.lord@newcastle.ac.uk (Phillip Lord)
To: Stephen Berman <stephen.berman@gmx.net>
Cc: emacs-devel@gnu.org
Subject: Re: Git question: specify branches to push
Date: Fri, 28 Nov 2014 10:35:11 +0000	[thread overview]
Message-ID: <87k32f8vfk.fsf@newcastle.ac.uk> (raw)
In-Reply-To: <87sih5lyzd.fsf@rosalinde.fritz.box> (Stephen Berman's message of "Thu, 27 Nov 2014 11:27:50 +0100")

Stephen Berman <stephen.berman@gmx.net> writes:

> I've pushed several commits to emacs-24 at Savannah, and each time git
> says the following:
>
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 'srb@git.sv.gnu.org:/srv/git/emacs.git'
> hint: Updates were rejected because a pushed branch tip is behind its remote
> hint: counterpart. If you did not intend to push that branch, you may want to
> hint: specify branches to push or set the 'push.default' configuration variable
> hint: to 'simple', 'current' or 'upstream' to push only the current branch.
>
> Of course I didn't want to push master so it's good it was rejected, but
> it would be unpleasant if my master branch happens to be up to date when
> I push emacs-24 (or vice versa).  But how do I tell git to push only
> emacs-24 (or only master)?  I tried `git push emacs-24' and `git push
> origin/emacs-24' but it didn't recognize either as an existing branch.


This is the default behaviour for Magit, incidentally. You push and it
pushes the branch that you are on. Underneath, I guess, it's using
tracking branches (which automatically sets upstream branch).

Phil



      parent reply	other threads:[~2014-11-28 10:35 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-27 10:27 Git question: specify branches to push Stephen Berman
2014-11-27 10:30 ` Lars Magne Ingebrigtsen
2014-11-27 11:15   ` Stephen Berman
2014-11-27 16:19   ` Eli Zaretskii
2014-11-27 16:43     ` Lars Magne Ingebrigtsen
2014-11-27 16:45       ` Eli Zaretskii
2014-11-27 16:53         ` Lars Magne Ingebrigtsen
2015-04-18  6:04           ` Steinar Bang
2014-11-27 17:04         ` David Engster
2014-11-27 17:14           ` Eli Zaretskii
2014-11-27 19:38             ` Stephen Berman
2014-11-27 17:06         ` Andreas Schwab
2014-11-27 10:59 ` Lee Duhem
2014-11-28 10:35 ` Phillip Lord [this message]

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=87k32f8vfk.fsf@newcastle.ac.uk \
    --to=phillip.lord@newcastle.ac.uk \
    --cc=emacs-devel@gnu.org \
    --cc=stephen.berman@gmx.net \
    /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.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.