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

diff --git a/revision.h b/revision.h
index 92d6614af6da62160219b0df40d0caf56335ffce..95859ba119033ba17346c701493df1474eec5df2 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -144,6 +144,7 @@ struct rev_info {
        int             numbered_files;
        int             reroll_count;
        char            *message_id;
+       struct ident_split from_ident;
        struct string_list *ref_message_ids;
        int             add_signoff;
        const char      *extra_headers;