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 /Documentation/git-diff.txt | |
| parent | Merge branch 'jc/apply-trailing-blank-removal' into maint (diff) | |
| parent | merge --no-edit: do not credit people involved in the side branch (diff) | |
| download | tgif-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 'Documentation/git-diff.txt')
0 files changed, 0 insertions, 0 deletions