[PATCH 23/24] rebase: keep backup of overwritten files on --skip or --abort

[Nguyễn Thái Ngọc Duy]

Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 builtin/rebase.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index b5c99ec10c..5c7b223843 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -573,8 +573,12 @@ static int reset_head(struct object_id *oid, const char 
*action,
        unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
        unpack_tree_opts.update = 1;
        unpack_tree_opts.merge = 1;
-       if (!detach_head)
+       if (!detach_head) {
                unpack_tree_opts.reset = 1;
+               repo_config_get_bool(the_repository, "core.backupLog",
+                                    &unpack_tree_opts.keep_backup);
+       }
+
 
        if (read_index_unmerged(the_repository->index) < 0) {
                ret = error(_("could not read index"));
-- 
2.20.0.rc2.486.g9832c05c3d