git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: fast forward a branch from another

From
Junio C Hamano <gitster@pobox.com>
Date
May 12, 2011, 16:06 UTC
Message-ID
<7vsjsjdhud.fsf@alter.siamese.dyndns.org>
In-Reply-To
<BANLkTi=PtkDp8PNdMNi3hTwHPjFg+Jtftw@mail.gmail.com>
Eric Frederich <eric.frederich@gmail.com> writes:
Show 7 quoted lines
> 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).

Previous: Michael J GruberNext: Phil Hord
Message 4 of 7 in “fast forward a branch from another”
  1. Eric FrederichMay 12, 2011
  2. Michael J GruberMay 12, 2011
  3. Michael J GruberMay 12, 2011
  4. Junio C HamanoMay 12, 2011
  5. Phil HordMay 12, 2011
  6. Junio C HamanoMay 12, 2011
  7. Phil HordMay 12, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.