git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jeff King <peff@peff.net>
Date
Oct 18, 2008, 15:48 UTC
Message-ID
<20081018154824.GA20185@coredump.intra.peff.net>
In-Reply-To
<48F91E59.50202@gmail.com>
On Sat, Oct 18, 2008 at 12:23:05AM +0100, William Pursell wrote:
> I occasionally use commands like 'cp $REMOTE $MERGED' with
> mergetool, and would prefer to not be prompted to start
> the tool on each file.  A --force option would be handy.

I think it is reasonable to want to skip this prompt, but I am not sure "--force" is the right name for such an option. Usually we reserve --force for "the tool is trying to prevent something destructive or unusual, and the user wants to override it".

Something like --no-prompt makes more sense to me, though probably something a little easier to type would be nice (or maybe alias "-n").

-Peff
Previous: William PursellNext: William Pursell
Message 2 of 6 in “feature request: git-mergetool --force”
  1. feature request: git-mergetool --forceWilliam Pursell, Oct 17, 2008
  2. Jeff KingOct 18, 2008
  3. William PursellOct 18, 2008
  4. Jeff KingOct 18, 2008
  5. Charles BaileyOct 18, 2008
  6. Jeff KingOct 19, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.