git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Frederich <eric.frederich@gmail.com>
To: git@vger.kernel.org
Subject: fast forward a branch from another
Date: Thu, 12 May 2011 10:40:16 -0400	[thread overview]
Message-ID: <BANLkTi=PtkDp8PNdMNi3hTwHPjFg+Jtftw@mail.gmail.com> (raw)

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

The problem here is that the act of going backwards (via checking out
stable) really messes up my IDE and or Text editors.
Is there any way to do this without switching branches, which modifies
my working directory, which messes up my IDE?

Thanks,
~Eric

             reply	other threads:[~2011-05-12 14:40 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-12 14:40 Eric Frederich [this message]
2011-05-12 15:31 ` fast forward a branch from another Michael J Gruber
2011-05-12 15:34   ` Michael J Gruber
2011-05-12 16:06 ` Junio C Hamano
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='BANLkTi=PtkDp8PNdMNi3hTwHPjFg+Jtftw@mail.gmail.com' \
    --to=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 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).