diff options
| author |  Ralf Thielow <ralf.thielow@gmail.com> | 2013-08-21 20:48:57 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-08-21 15:44:15 -0700 |
| commit | a9f739c111898ed879bc077fb3a2f71b9766bba7 (patch) | |
| tree | 091ee674536fba965c690fd93004738a31caa94c /Documentation/git-sh-setup.txt | |
| parent | Git 1.8.4-rc4 (diff) | |
| download | tgif-a9f739c111898ed879bc077fb3a2f71b9766bba7.tar.xz | |
rebase --preserve-merges: ignore "merge.log" config
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" to the git-merge call.
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-sh-setup.txt')
0 files changed, 0 insertions, 0 deletions