From: Jeff King Date: Wed, 29 Oct 2008 17:11:22 GMT Subject: Re: [PATCH] git-diff: Add --staged as a synonym for --cached. Message-ID: <20081029171122.GA12167@sigill.intra.peff.net> In-Reply-To: On Wed, Oct 29, 2008 at 06:06:09PM +0100, Johannes Schindelin wrote: > However, note that we have to hash out what to do about the convention > that --cached traditionally means that only the staging area (formerly > known as "the index") is affected, while --index means that the command > touches the working directory, too. 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) -Peff