diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-10 13:46:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-10 13:46:29 -0800 |
| commit | cf6c52fce8bf0870069b630a2e199483f8f9faac (patch) | |
| tree | 99a52b465c95f4a85316772425cf8ce173125b18 /prompt.c | |
| parent | 44fe83502edf5391bb3a5997cab01794b4568062 (diff) | |
| parent | 9bcbb1c218d075d8b180cfef4c9089f868151e7e (diff) | |
| download | git-cf6c52fce8bf0870069b630a2e199483f8f9faac.tar.gz git-cf6c52fce8bf0870069b630a2e199483f8f9faac.tar.xz | |
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 'prompt.c')
0 files changed, 0 insertions, 0 deletions