From: Charles Bailey Date: Tue, 21 Oct 2008 12:26:55 GMT Subject: Re: [PATCH 2/3] Add -n/--no-prompt option to mergetool 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: > > 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/