diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-22 10:34:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-22 10:34:02 -0700 |
| commit | c5c23745d8d6eb0504a16851b9b080ec3ded94f9 (patch) | |
| tree | dc33066ecc7196f86129447c1e1b17f2740df4dd /t/t4013/diff.diff_initial..side | |
| parent | Merge branch 'jn/web' (diff) | |
| parent | rebase --merge: fix for rebasing more than 7 commits. (diff) | |
| download | git-c5c23745d8d6eb0504a16851b9b080ec3ded94f9.tar.gz git-c5c23745d8d6eb0504a16851b9b080ec3ded94f9.zip | |
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
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions