On Thu, 30 Nov 2006 Linus Torvalds wrote: > On Thu, 30 Nov 2006, Nicolas Pitre wrote: > > > > Would it make sense for "git add" to do the same as "git update-index" > > on already tracked files? Given the explanation above this would make > > 100% sense to me. > > Yeah, I think it would probably make sense. I also think it would make > sense to rename "update-index" entirely, or at least offer other names for > it (ie the "git resolved" suggestion). On Thu, 30 Nov 2006 22:16:29 +0100, Jakub Narebski wrote: > I'm very much for having git-add, -rm, -mv and -resolved as porcelain > wrappers around git update-index, so there would be even less events > when you have to use this plumbish command directly. I'm happy with the direction of having several commands that take the place of update-index, each with its own name oriented toward what the user wants to do. Obviously, "add", "mv", and "rm" have obvious places where the user wants to use them. There's the merge case where "resolve" and "resolved" have both been floated as possible names. It might even make sense to invent one more name for the case where the user wants to inform git that a file has been edited and that git should accept the new contents. It's the sort of "note that file is edited" operation that could be recommended to the user with "add; fix typo; commit" confusion. Sure, "add" could be used again, and "update-index" clearly _works_ but it's a rather ugly name, (and already has "plumbing" functionality like --add and --remove that we don't want here). If "resolved" is the name for the new command, then "edited" might work, but I think these adjectives don't work well next to the more active verbs that git normally accepts, (and yes, "mv" and "rm" are verbs even if horribly mangled spellings). So I'd vote for "resolve" along with something else for the mark-as-edited case. Maybe "refresh"? That's the best I've thought of so far. Anyone else have a better suggestion? It does clash with the separate notion of "git update-index --refresh" which is a bit annoying. Any other suggestions for this? -Carl
Attachment:
pgpmc3SvMZvDJ.pgp
Description: PGP signature