diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-08-02 11:44:19 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-02 15:16:09 -0700 |
| commit | 8d8cb4b047cef546ea80b8224c7b33707f6d6a4c (patch) | |
| tree | 1f322b953e16e9fc879560a0fc81c67b81042ba0 /sha1_file.c | |
| parent | t3504: use test_commit (diff) | |
| download | tgif-8d8cb4b047cef546ea80b8224c7b33707f6d6a4c.tar.xz | |
cherry-pick/revert: remember --rerere-autoupdate
When continuing after conflicts, cherry-pick forgot if the user had specified
'--rerere-autoupdate'.
Redo the cherry-pick rerere tests to check --rerere-autoupdate works
as expected.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions