git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH 0/3] rebase --merge improvements and fixes
Date: Sat, 24 Jun 2006 18:29:46 -0700	[thread overview]
Message-ID: <11511989892359-git-send-email-normalperson@yhbt.net> (raw)
In-Reply-To: <20060622110941.GA32261@hand.yhbt.net>

These patches should address the current issues with rebase --merge
usage.  It can now do everything the original format-patch | am -3
strategy including --skip and detection of merged commits by upstream.

-- 
Eric Wong

  parent reply	other threads:[~2006-06-25  1:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-22  8:44 [PATCH] rebase --merge: fix for rebasing more than 7 commits Junio C Hamano
2006-06-22  8:54 ` Junio C Hamano
2006-06-22 11:09   ` Eric Wong
2006-06-24  7:09     ` Junio C Hamano
2006-06-25  1:29     ` Eric Wong [this message]
2006-06-25  1:29     ` [PATCH 1/3] rebase: allow --merge option to handle patches merged upstream Eric Wong
2006-06-25  2:04       ` Johannes Schindelin
2006-06-25  4:59         ` Eric Wong
2006-06-25  1:29     ` [PATCH 2/3] rebase: cleanup rebasing with --merge Eric Wong
2006-06-25  1:29     ` [PATCH 3/3] rebase: allow --skip to work " Eric Wong

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=11511989892359-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 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).