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

Re: [PATCH 2/3] Add -n/--no-prompt option to mergetool

From
Charles Bailey <charles@hashpling.org>
Date
Nov 13, 2008, 12:28 UTC
Message-ID
<20081113122844.GA26842@hashpling.org>
In-Reply-To
<4902F0C2.2070709@gmail.com>
On Sat, Oct 25, 2008 at 11:11:14AM +0100, William Pursell wrote:
Show 13 quoted lines
>
> My thinking is that when using an interactive tool
> like vimdiff, the user is probably not going to
> care as much about being prompted, or may prefer
> to have the prompt in that situation.  However,
> if they've written a script to do the merge
> non-interactively, then the prompt is undesirable.
>
> So a person might want to be prompted with
> git mergetool -t vimdiff, and prefer no prompt
> with git mergetool -t my-script.  Being able
> to configure the behavior on a per-tool
> basis would allow that.

I can see your point, although personally I feel that if you've gone to the trouble of writing a special script, the extra typing of an extra long option (if you prefer prompting normally) is not that big compared with the hassle of maintaining per-tool config settings if you like to regularly swap between merge tools.

Both scenarios are probably not too common so I wouldn't object strongly to either. (But per tool configs is more dev work!)

-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
Previous: William Pursell
Message 13 of 13 in “Fix some tab/space inconsistencies in git-mergetool.sh”
  1. 1/3 Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey, Oct 21, 2008
  2. 2/3 Add -n/--no-prompt option to mergetoolCharles Bailey, Oct 21, 2008
  3. 3/3 Add -k/--keep-going option to mergetoolCharles Bailey, Oct 21, 2008
  4. Jeff KingOct 21, 2008
  5. Andreas EricssonOct 21, 2008
  6. Charles BaileyOct 21, 2008
  7. Charles BaileyOct 22, 2008
  8. Junio C HamanoOct 22, 2008
  9. Charles BaileyOct 23, 2008
  10. William PursellOct 24, 2008
  11. Charles BaileyOct 24, 2008
  12. William PursellOct 25, 2008
  13. Charles BaileyNov 13, 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.