summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-10 13:46:29 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-10 13:46:29 -0800
commitcf6c52fce8bf0870069b630a2e199483f8f9faac (patch)
tree99a52b465c95f4a85316772425cf8ce173125b18 /builtin.h
parent44fe83502edf5391bb3a5997cab01794b4568062 (diff)
parent9bcbb1c218d075d8b180cfef4c9089f868151e7e (diff)
downloadgit-cf6c52fce8bf0870069b630a2e199483f8f9faac.tar.gz
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
Stop spending cycles to compute information to be placed on commented lines in "merge --no-edit", which will be discarded anyway. * jc/maint-fmt-merge-msg-no-edit-lose-credit: merge --no-edit: do not credit people involved in the side branch
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin.h b/builtin.h
index 3faf9d6691..7e7bbd665a 100644
--- a/builtin.h
+++ b/builtin.h
@@ -15,7 +15,8 @@ extern const char git_more_info_string[];
extern void prune_packed_objects(int);
struct fmt_merge_msg_opts {
- unsigned add_title:1;
+ unsigned add_title:1,
+ credit_people:1;
int shortlog_len;
};