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
Oct 21, 2008, 12:26 UTC
Message-ID
<20081021122655.GA29294@hashpling.org>
In-Reply-To
<48FDC1CA.2080800@op5.se>
On Tue, Oct 21, 2008 at 01:49:30PM +0200, Andreas Ericsson wrote:
Show 5 quoted lines
>
> There is discussion already about "-n should be for dry-run!" and git's
> inconsistencies in such matters. Wouldn't -y ("assume yes on prompt")
> be better?
>

I must have missed this discussion. I've just had a very quick look at a handful of basic modifying git commands (merge, pull, commit, checkout, reset, revert) and only found 'add' that used -n as --dry-run.

That said, I've no real objections to -y if that makes for a better consensus.

-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
Previous: Andreas EricssonNext: Charles Bailey
Message 6 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.