From: Jeff King <peff@peff.net>
Date: Mon, 03 Nov 2008 07:04:30 GMT
Subject: Re: [PATCH] git-diff: Add --staged as a synonym for --cached.
Message-ID: <20081103070430.GC10772@coredump.intra.peff.net>
In-Reply-To: <7vprle1qdl.fsf@gitster.siamese.dyndns.org>

On Sun, Nov 02, 2008 at 01:30:46AM -0700, Junio C Hamano wrote:

> A flag "--staged" that means "staged changes and changes in the work tree"
> is no worse than the current "--index".  If we were to shoot for clarity,

Well, there is another flag state to be considered, of course, which is
"no flag".  So I think "--staged" is fine to mean the working tree and
staged, as long as the default (i.e., no option given) is to operate on
the working tree.

I can't think offhand of any commands that violate that assumption.

> how about --staged-only (aka --cached) vs --staged-and-unstaged (aka --index)?
> 
> I am actually actively unhappy about the latter, but I like more
> descriptive --staged-only for the former a lot better.

Agreed. --staged-only is fine to me, but --staged-and-unstaged just
seems too long.

-Peff