Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] git-am: create a config setting for reject control.

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:49:56

Paul Gortmaker [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help