Use "git merge" instead of "git pull ."

diff --git a/builtin/add.c b/builtin/add.c
index f45d9d4865534f6f8faeb3b2c64da0721452921f..8266a9cb7091c046f63c7b0137daf0bce0180a12 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -343,6 +343,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
 
        argc = setup_revisions(argc, argv, &rev, NULL);
        rev.diffopt.output_format = DIFF_FORMAT_PATCH;
+       rev.diffopt.use_color = 0;
        DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
        out = open(file, O_CREAT | O_WRONLY, 0666);
        if (out < 0)