From: Michael J Gruber <git@drmicha•warpmail.net>
To: unlisted-recipients:; (no To-header on input)
Cc: Eric Frederich <eric.frederich@gmail•com>, git@vger•kernel.org
Subject: Re: fast forward a branch from another
Date: Thu, 12 May 2011 17:34:01 +0200 [thread overview]
Message-ID: <4DCBFDE9.9060700@drmicha.warpmail.net> (raw)
In-Reply-To: <4DCBFD55.9050005@fastmail.fm>
Michael J Gruber venit, vidit, dixit 12.05.2011 17:31:
> Eric Frederich venit, vidit, dixit 12.05.2011 16:40:
>> 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?
>
> I assume this is a ff-situation, i.e. stable is fully contained in
> developement? then you can reset branch stable like this:
>
> test 0 -eq $(git rev-list --count ^development stable) && git branch -f
> stable development
>
> (I thought you could git rev-list --quiet but I'm too dumb :|)
In fact, am I even too dumb to set my from address today. Sorry! Have to
give "virtual identity" another try...
Michael
next prev parent reply other threads:[~2011-05-12 15:34 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 [this message]
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=4DCBFDE9.9060700@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=eric.frederich@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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