From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Feb 2010 06:32:10 GMT
Subject: Re: [PATCH] merge: --no-ff configuration setting
Message-ID: <7vljekbgyd.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1266807555-86199-1-git-send-email-bryanalves@gmail.com>

Bryan Alves <bryanalves@gmail.com> writes:

>  Documentation/merge-options.txt |    4 +++-
>  builtin-merge.c                 |    3 +++

This needs tests to make sure that existing programs that internally use
"git merge" (e.g. "rebase -m", "rebase -i") do not break when the end user
has this configuration set in the repository, in addition to that "merge"
works as expected with and without this configuration variable, with
combinations with the use of relevant command line options.