From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Oct 2010 16:20:49 GMT
Subject: Re: [PATCH] git-am: create a config setting for reject control.
Message-ID: <7vlj5h6kda.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1288315650-2488-1-git-send-email-paul.gortmaker@windriver.com>

Paul Gortmaker <paul.gortmaker@windriver.com> writes:

> git am already accepts a "--reject" switch, which basically means
> apply the bits you can, but you can't set it as enabled by default
> currently.

Does this work correctly with all four combinations of (have/do not have)
config, (have/do not have) command line option, when "am" stops in the
middle due to conflict and you say "git am --continue" after dealing with
the first such conflict?  The first choice needs to be remembered and
used.