git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Mon, 14 Jan 2013 15:33:30 +0000 (07:33 -0800)
committer	Junio C Hamano <redacted>
	Mon, 14 Jan 2013 15:33:30 +0000 (07:33 -0800)
commit	bc60f9f37767f72d7ef73a4df536e199a3c13540
tree	3ec249750110e61bb1ce802fc361fe5151cbf7fd	tree \| snapshot
parent	7842c44ccb89dc6c88e67bcc559bc9b38c617e0c	commit \| diff
parent	9bcbb1c218d075d8b180cfef4c9089f868151e7e	commit \| diff

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

builtin.h	diff1 \|	diff2 \|	blob \| history
builtin/fmt-merge-msg.c	diff1 \|	diff2 \|	blob \| history
builtin/merge.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

builtin.h	diff1 \|	diff2 \|	blob \| history
builtin/fmt-merge-msg.c	diff1 \|	diff2 \|	blob \| history
builtin/merge.c	diff1 \|	diff2 \|	blob \| history