All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Cc: Eric Wong <normalperson@yhbt.net>
Subject: [PATCH (fixed)] rebase: Allow merge strategies to be used when rebasing
Date: Wed, 21 Jun 2006 03:04:40 -0700	[thread overview]
Message-ID: <11508842824018-git-send-email-normalperson@yhbt.net> (raw)
In-Reply-To: <20060621100138.GA15748@localdomain>

1 - is fixed for --onto usage.
2 - in the series is the test from Junio, so I'm not resending it:
	Subject: [PATCH] Add renaming-rebase test.
3 - keeps the NO_PYTHON people happy

-- 
Eric Wong

  reply	other threads:[~2006-06-21 10:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-18  3:02 [PATCH] rebase: Allow merge strategies to be used when rebasing Eric Wong
2006-06-18  9:08 ` Junio C Hamano
2006-06-19 21:39   ` Eric Wong
2006-06-19 21:55     ` Junio C Hamano
2006-06-21 10:01       ` Eric Wong
2006-06-21 10:04         ` Eric Wong [this message]
2006-06-21 10:04           ` [PATCH 1/3] " Eric Wong
2006-06-21 10:04             ` [PATCH 3/3] rebase: error out for NO_PYTHON if they use recursive merge Eric Wong
2006-06-21 11:01           ` [PATCH (fixed)] rebase: Allow merge strategies to be used when rebasing Junio C Hamano
2006-06-21 11:01         ` [PATCH] " Junio C Hamano
2006-06-18 11:48 ` [PATCH] Add renaming-rebase test Junio C Hamano

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=11508842824018-git-send-email-normalperson@yhbt.net \
    --to=normalperson@yhbt.net \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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.