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

diff --git a/log-tree.c b/log-tree.c
index 2eb69bcfed096d28bff736deca715458605d902a..a49d8e895d3ad24f00e8504ec3eccfbddead6b4c 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -617,6 +617,9 @@ void show_log(struct rev_info *opt)
        ctx.fmt = opt->commit_format;
        ctx.mailmap = opt->mailmap;
        ctx.color = opt->diffopt.use_color;
+       ctx.output_encoding = get_log_output_encoding();
+       if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
+               ctx.from_ident = &opt->from_ident;
        pretty_print_commit(&ctx, commit, &msgbuf);
 
        if (opt->add_signoff)