diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-14 07:33:30 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-14 07:33:30 -0800 |
commit | bc60f9f37767f72d7ef73a4df536e199a3c13540 (patch) | |
tree | 3ec249750110e61bb1ce802fc361fe5151cbf7fd /builtin.h | |
parent | 7842c44ccb89dc6c88e67bcc559bc9b38c617e0c (diff) | |
parent | 9bcbb1c218d075d8b180cfef4c9089f868151e7e (diff) | |
download | git-bc60f9f37767f72d7ef73a4df536e199a3c13540.tar.gz git-bc60f9f37767f72d7ef73a4df536e199a3c13540.tar.xz |
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maint
"git merge --no-edit" computed who were involved in the work done
on the side branch, even though that information is to be discarded
without getting seen in the editor.
* 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.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; }; |