diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-08-05 22:27:43 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-15 20:00:03 -0700 |
| commit | 3668d4238314dc5db98de3034058f68ff57a6b1e (patch) | |
| tree | a7d5c5494e53eeeb7a2c8fc4a93dbd181cbcef59 /git.c | |
| parent | 2bc8c1a8a6b1cdffc19badc7272f552302b79d3e (diff) | |
| download | git-3668d4238314dc5db98de3034058f68ff57a6b1e.tar.gz git-3668d4238314dc5db98de3034058f68ff57a6b1e.tar.xz | |
merge-file: run setup_git_directory_gently() sooner
Part of a campaign to make repository-local configuration
available early (simplifying the startup sequence for
built-in commands).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -350,7 +350,7 @@ static void handle_internal_command(int argc, const char **argv) { "mailsplit", cmd_mailsplit }, { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE }, { "merge-base", cmd_merge_base, RUN_SETUP }, - { "merge-file", cmd_merge_file }, + { "merge-file", cmd_merge_file, RUN_SETUP_GENTLY }, { "merge-index", cmd_merge_index, RUN_SETUP }, { "merge-ours", cmd_merge_ours, RUN_SETUP }, { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, |