diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:40 -0700 |
| commit | ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0 (patch) | |
| tree | b28ec107bf91e7c460c1fafac96cc9d7208217ed /t | |
| parent | 0d107b19890db191c9281bff67180389fb53df24 (diff) | |
| parent | 082ef75b7bfc90ac236afbb857a9552a026832b8 (diff) | |
| download | git-ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0.tar.xz | |
Merge branch 'js/rebase-cleanup'
Update supporting parts of "git rebase" to remove code that should
no longer be used.
* js/rebase-cleanup:
rebase: fold git-rebase--common into the -p backend
sequencer: the `am` and `rebase--interactive` scripts are gone
.gitignore: there is no longer a built-in `git-rebase--interactive`
t3400: stop referring to the scripted rebase
Drop unused git-rebase--am.sh
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3400-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 42f147858d..80b23fd326 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -285,7 +285,7 @@ EOF test_cmp From_.msg out ' -test_expect_success 'rebase--am.sh and --show-current-patch' ' +test_expect_success 'rebase --am and --show-current-patch' ' test_create_repo conflict-apply && ( cd conflict-apply && |