![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 21 Jun 2006 10:56:41 +0000 (03:56 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 21 Jun 2006 10:56:41 +0000 (03:56 -0700) | ||
| commit | 160a59f326d55970f8a038ef635c662b9c648c75 | |
| tree | 5b005f53099a7cf02ccf1b784548cce0c7d277c0 | tree | snapshot |
| parent | 9d24ed4f019e035eeb8125c2c595876ad1211a3a | commit | diff |
| parent | 693c15dc282c36042eac8d215beae3067db7565c | commit | diff |
Merge branch 'ew/rebase' into next
* ew/rebase:
rebase: error out for NO_PYTHON if they use recursive merge
Add renaming-rebase test.
rebase: Allow merge strategies to be used when rebasing
object-refs: avoid division by zero
* ew/rebase:
rebase: error out for NO_PYTHON if they use recursive merge
Add renaming-rebase test.
rebase: Allow merge strategies to be used when rebasing
object-refs: avoid division by zero