summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-14 07:33:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-14 07:33:30 -0800
commitbc60f9f37767f72d7ef73a4df536e199a3c13540 (patch)
tree3ec249750110e61bb1ce802fc361fe5151cbf7fd /Documentation
parentMerge branch 'jc/apply-trailing-blank-removal' into maint (diff)
parentmerge --no-edit: do not credit people involved in the side branch (diff)
downloadtgif-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')
0 files changed, 0 insertions, 0 deletions