From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 02 Nov 2008 08:30:46 GMT
Subject: Re: [PATCH] git-diff: Add --staged as a synonym for --cached.
Message-ID: <7vprle1qdl.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20081029171122.GA12167@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> If we assume that we have only the word "stage" and variations
> available, then there aren't too many options.
>
>   only the staging area:
>     --stage-only, --staged-only
>
>   both:
>     --staged (as opposed to --staged-only) --stage-and-worktree (too
>     long), --both (not descriptive enough), --stage-too (yuck)

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,
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.