diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-04-07 14:28:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-10 16:28:02 (GMT) |
| commit | f8a178580719a93040a49cf25624f1d56d0147f1 (patch) | |
| tree | 611961be6b842c0d14e7f28c6392440a0d8a6650 /Documentation/git-rebase.txt | |
| parent | a03b55530ab844974b7058042a015fcfcd9e7a53 (diff) | |
| download | git-f8a178580719a93040a49cf25624f1d56d0147f1.zip git-f8a178580719a93040a49cf25624f1d56d0147f1.tar.gz git-f8a178580719a93040a49cf25624f1d56d0147f1.tar.bz2 | |
t5520: make test_pull_autostash() accept expect_parent_num
Before, test_pull_autostash() was hardcoded to run
`test_cmp_rev HEAD^ copy` to test that a rebase happened. However, in a
future patch, we plan on testing merging as well. Make
test_pull_autostash() accept a parent number as an argument so that, in
the future, we can test if a merge happened in addition to a rebase.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
0 files changed, 0 insertions, 0 deletions