pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/builtin-config.c b/builtin-config.c
index 2e3ef911d6d6682bc2f71ea912b05768fb6298be..4bc46b15fde00d913577a2980778746f8315bb70 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -358,7 +358,7 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)
                if (!is_absolute_path(given_config_file) && prefix)
                        config_exclusive_filename = prefix_filename(prefix,
                                                                    strlen(prefix),
-                                                                   argv[2]);
+                                                                   given_config_file);
                else
                        config_exclusive_filename = given_config_file;
        }