summaryrefslogtreecommitdiff
path: root/t/t9700-perl-git.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-14 15:33:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-14 15:33:30 (GMT)
commitbc60f9f37767f72d7ef73a4df536e199a3c13540 (patch)
tree3ec249750110e61bb1ce802fc361fe5151cbf7fd /t/t9700-perl-git.sh
parent7842c44ccb89dc6c88e67bcc559bc9b38c617e0c (diff)
parent9bcbb1c218d075d8b180cfef4c9089f868151e7e (diff)
downloadgit-bc60f9f37767f72d7ef73a4df536e199a3c13540.zip
git-bc60f9f37767f72d7ef73a4df536e199a3c13540.tar.gz
git-bc60f9f37767f72d7ef73a4df536e199a3c13540.tar.bz2
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 't/t9700-perl-git.sh')
0 files changed, 0 insertions, 0 deletions