Junio C Hamano
c5c23745d8
Merge branch 'ew/rebase'
...
* ew/rebase:
rebase --merge: fix for rebasing more than 7 commits.
rebase: error out for NO_PYTHON if they use recursive merge
Add renaming-rebase test.
rebase: Allow merge strategies to be used when rebasing
2006-06-22 10:34:02 -07:00
..
2006-06-07 17:25:21 -07:00
2006-06-07 11:49:35 -07:00
2006-06-07 11:49:35 -07:00
2006-06-07 12:37:46 -07:00
2006-06-16 22:45:11 -07:00
2006-06-07 11:49:35 -07:00
2006-06-21 02:34:14 -07:00
2006-06-07 16:32:50 -07:00
2006-06-07 11:49:35 -07:00
2006-06-06 14:16:43 -07:00
2006-06-07 20:19:00 -07:00
2006-06-07 16:29:36 -07:00
2006-06-07 11:49:35 -07:00
2006-06-16 22:33:46 -07:00
2006-06-17 17:56:52 -07:00
2006-06-21 03:56:29 -07:00
2006-06-21 02:34:14 -07:00
2006-06-18 21:19:07 -07:00
2006-06-22 00:20:20 -07:00
2006-06-07 12:37:46 -07:00
2006-06-18 04:18:25 -07:00
2006-06-21 02:34:14 -07:00
2006-06-07 11:49:35 -07:00
2006-06-21 02:34:14 -07:00
2006-06-07 12:37:46 -07:00
2006-06-07 11:49:35 -07:00
2006-06-07 11:49:35 -07:00