From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Jun 2006 21:05:13 +0000 (-0700)
Subject: Merge branch 'ew/rebase'
X-Git-Tag: v1.4.1-rc2~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=57be46fd213b448f66b1470187109e7d6ad6f475;p=git.git

Merge branch 'ew/rebase'

* ew/rebase:
  rebase: allow --skip to work with --merge
  rebase: cleanup rebasing with --merge
  rebase: allow --merge option to handle patches merged upstream
---

57be46fd213b448f66b1470187109e7d6ad6f475