From: Junio C Hamano <gitster@pobox.com>
To: Eric Frederich <eric.frederich@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: fast forward a branch from another
Date: Thu, 12 May 2011 09:06:02 -0700 [thread overview]
Message-ID: <7vsjsjdhud.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <BANLkTi=PtkDp8PNdMNi3hTwHPjFg+Jtftw@mail.gmail.com> (Eric Frederich's message of "Thu, 12 May 2011 10:40:16 -0400")
Eric Frederich <eric.frederich@gmail.com> writes:
> Often times I get into a situation where I have a "development" branch
> that gets ahead of say a "stable" branch.
> When I am ready to call the development branch stable this is what I do.
>
> $ git checkout stable
> $ git merge development
> $ git checkout development
Instead of switching to "stable", while still on the development, you
could do
$ git push . HEAD:stable
which would succeed only when you are purely ahead of stable (otherwise it
will fail as you are not forcing).
next prev parent reply other threads:[~2011-05-12 16:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-12 14:40 fast forward a branch from another Eric Frederich
2011-05-12 15:31 ` Michael J Gruber
2011-05-12 15:34 ` Michael J Gruber
2011-05-12 16:06 ` Junio C Hamano [this message]
2011-05-12 16:26 ` Phil Hord
2011-05-12 16:49 ` Junio C Hamano
2011-05-12 16:58 ` Phil Hord
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=7vsjsjdhud.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=eric.frederich@gmail.com \
--cc=git@vger.kernel.org \
/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 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.