diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 09:13:29 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-01-14 12:13:04 -0800 |
| commit | 0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763 (patch) | |
| tree | c1c4b356f5b889b13c436bb4b6a6adb301c587f1 /builtin/merge.c | |
| parent | sha1-name.c: remove implicit dependency on the_index (diff) | |
| download | tgif-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.tar.xz | |
merge-recursive.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index dc0b7cc521..bc1aecfe70 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -702,7 +702,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, return 2; } - init_merge_options(&o); + init_merge_options(&o, the_repository); if (!strcmp(strategy, "subtree")) o.subtree_shift = ""; |