Re: [PATCH] rebase --preserve-merges: ignore merge.log config

2013-08-21 Thread Eric Sunshine
On Wed, Aug 21, 2013 at 2:48 PM, Ralf Thielow ralf.thie...@gmail.com wrote: When merge.log config is set, rebase --preserve-merges will add the log lines to the message of the rebased merge commit. A rebase should not modify a commit message automatically. Teach git-rebase to ignore that

Re: [PATCH] rebase --preserve-merges: ignore merge.log config

2013-08-21 Thread Junio C Hamano
Ralf Thielow ralf.thie...@gmail.com writes: When merge.log config is set, rebase --preserve-merges will add the log lines to the message of the rebased merge commit. A rebase should not modify a commit message automatically. Teach git-rebase to ignore that configuration by passing --no-log