Merge branch 'ew/rebase'
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:05:13 +0000 (14:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:05:13 +0000 (14:05 -0700)
commit57be46fd213b448f66b1470187109e7d6ad6f475
tree7b597a96f96d9ec65d4af995c0bfbc530be58e55
parent07d68930c247325116ad4a63422eb1520aaf6ef8
parentd5e673b60be2eb99153276366b6b5ff3277805df
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