]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-diff.txt
Revert "git-diff: Introduce --index and deprecate --cached."
authorJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 09:33:43 +0000 (01:33 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 10:03:11 +0000 (02:03 -0800)
commitf2dd1c9adfe961ea611545b018bc67e5d83ee3db
treeaef6570d53bd8d49aeda4a2f313cfa705d7a1ca8
parent1349f8771310987dd07b679a512e46e1b17e2b8d
Revert "git-diff: Introduce --index and deprecate --cached."

This reverts commit 4c81c213a479e4aae0653a56ad6e8db5c31f019c.

Although --cached and --index are confusing wording, the use of
word --cached for git-diff is consistent with git-apply.  It means
"work with index without looking at the working tree".

We should probably come up with better wording for --cached, if
somebody wants to deprecate it.  But making --index and --cached
synonyms for diff while leaving them mean different things for
apply is no good.
Documentation/git-diff.txt
builtin-diff.c