Re: [PATCH] feature request: git-mergetool --force

From: Jeff King <peff@peff.net>
Date: Oct 19, 2008, 11:47 UTC
Message-ID: <20081019114722.GA30412@coredump.intra.peff.net>
In-Reply-To: <48FA6E55.9030101@hashpling.org>

On Sun, Oct 19, 2008 at 12:16:37AM +0100, Charles Bailey wrote:

Show 10 quoted lines

> I've recently been using git mergetool quite a bit and I'm currently
> cooking a couple of patches. The first, by coincidence, was a "-n"
> option which disabled the hit-return-to-actually-do-anything prompt. I,
> also, used the variable "NOPROMPT" to describe this behaviour.
> 
> The other change that I am working was more of an issue for me. When I
> have a fair number of files to merge I sometimes want to skip a merge.
> Perhaps it's a tricky one and I want do the easy wins first.
> [...]
> Thoughts?

I think those are both reasonable behaviors. I also thought instantly of the issue you mentioned, that people who really did want to abort would get stuck in a loop of spawning the merge resolver. For that reason, I think it makes sense to have both of them as options (either config, command-line, or both). And if you do "git mergetool --no-prompt --keep-going", then you are accepting the fact that you won't have a chance to ask it to stop.

And I would suggest "-k, --keep-going" for the second option, as it reminds me of the similar "make" option.

-Peff