All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Carl Worth <cworth@cworth.org>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, Tom Clarke <tom@u2i.com>,
	Johannes.Schindelin@gmx.de, git@vger.kernel.org
Subject: Re: [PATCH] Adding rebase merge strategy
Date: Mon, 01 Oct 2007 16:11:54 -0700	[thread overview]
Message-ID: <7vabr2qvk5.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <87d4vysayq.wl%cworth@cworth.org> (Carl Worth's message of "Mon, 01 Oct 2007 15:53:49 -0700")

Carl Worth <cworth@cworth.org> writes:

> Though actually I'd like it even more if there was some way to mark a
> commit as having been "published" and the rebase strategy would refuse
> to rebase published commits.

That is not "though actually", but an independent topic.

The need is indeed so real that there is a hook git-rebase pays
attention to in order to help you with that.  I use it to
prevent myself from accidentally rebasing the topic branches
that I already merged to 'next'.

Unsurprisingly, it is called pre-rebase hook.

  reply	other threads:[~2007-10-01 23:12 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-28 16:15 [PATCH] Adding rebase merge strategy Tom Clarke
2007-09-28 17:03 ` Johannes Schindelin
2007-09-28 17:18   ` Tom Clarke
2007-10-01 15:08   ` Tom Clarke
2007-10-01 15:50     ` Johannes Schindelin
2007-10-01 21:01     ` Junio C Hamano
2007-10-01 21:41       ` Tom Clarke
2007-10-01 22:17         ` Carl Worth
2007-10-01 22:21           ` Tom Clarke
2007-10-01 22:30             ` Shawn O. Pearce
2007-10-01 22:53               ` Carl Worth
2007-10-01 23:11                 ` Junio C Hamano [this message]
2007-10-02 10:00               ` Johannes Schindelin
2007-10-02 10:29                 ` Tom Clarke
2007-10-02 18:40                   ` Junio C Hamano
2007-10-03 14:11                     ` Tom Clarke
2007-10-03 15:54                       ` Johannes Schindelin
2007-10-01 23:09           ` J. Bruce Fields
2007-10-01 22:28         ` Junio C Hamano
     [not found] <11885023904126-git-send-email-tom@u2i.com>
2007-08-30 19:36 ` Tom Clarke
2007-08-30 19:53   ` Johannes Schindelin

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=7vabr2qvk5.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=cworth@cworth.org \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.org \
    --cc=tom@u2i.com \
    /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.