![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Jun 2006 21:05:13 +0000 (14:05 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Jun 2006 21:05:13 +0000 (14:05 -0700) | ||
| commit | 57be46fd213b448f66b1470187109e7d6ad6f475 | |
| tree | 7b597a96f96d9ec65d4af995c0bfbc530be58e55 | tree | snapshot |
| parent | 07d68930c247325116ad4a63422eb1520aaf6ef8 | commit | diff |
| parent | d5e673b60be2eb99153276366b6b5ff3277805df | commit | diff |
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
* ew/rebase:
rebase: allow --skip to work with --merge
rebase: cleanup rebasing with --merge
rebase: allow --merge option to handle patches merged upstream