On Thu, Mar 14, 2019 at 5:58 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Duy Nguyen <pclouds@xxxxxxxxx> writes: > > > On Fri, Mar 8, 2019 at 5:17 PM Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote: > >> - --index has a different meaning in git-apply. I don't have a good > >> suggestion except "yeah we have two different worlds now, the old > >> and the new one" > > > > I will rename --index to --staged to avoid this. It is already used as > > synonym for --cached in git-diff. I will also add --staged as synonym > > to "git rm" so that "git status" can consistently advise "git <verb> > > --staged" where verb is either restore or rm. > > Does "restore --index" (now "--staged") work the same way as > "--cached" aka "--staged" in git-diff? "--cached" is about > affecting only what is in the index (as opposed to "--index" > affecting both the index and the working tree). Yes. To affect both you would need --staged --worktree (or -WS for short because I don't think anybody is going to type that many characters) > If it does, then calling it "--cached" aka "--staged" does make more > sense than calling it "--index", I would think. Otherwise, such a > rename does not buy us much. -- Duy
