mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2013-01-10 13:46:29 -08:00
parent 44fe83502e 9bcbb1c218
commit cf6c52fce8
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin.h
View File

@ -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;
};