From: Junio C Hamano Date: Mon, 14 Feb 2011 17:12:45 GMT Subject: Re: Consistent terminology: cached/staged/index Message-ID: <7vtyg6tu9e.fsf@alter.siamese.dyndns.org> In-Reply-To: Miles Bader writes: > Michael J Gruber writes: >> Short options should really not be "wasted" easily. "-s" named after "to >> stage" is really problematic, as outlined in this thread. > > Er, but the point is that this is _such_ a common operation, that a > short option for it would not be "wasted" at all. True, but I am afraid "-c" is not it, as it would certainly be confusing to users who know what "diff" does before they learn "git diff". And I'd like to also keep "-i" open for "ignore case", which I actually wished the other day while reviewing a topic. Unlike "-c", I might implement it myself not in a distant future when I find time. Using "-I" (as an abbreviation for "index-only") is tempting, though. Both "-i" and "-I" are GNU extensions, and the latter traditionally was useful primarily to ignore cruft left in the file with use of "$Id$", but we actively discourage its use in git controlled projects, so taking it over might not be such a big issue.