![[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) |
* ew/rebase:
rebase: allow --skip to work with --merge
rebase: cleanup rebasing with --merge
rebase: allow --merge option to handle patches merged upstream
rebase: allow --skip to work with --merge
rebase: cleanup rebasing with --merge
rebase: allow --merge option to handle patches merged upstream
Trivial merge