On Sun, Mar 23, 2008 at 08:00:17PM +0100, Mike Hommey wrote: > On Sun, Mar 23, 2008 at 06:21:02PM +0000, Luciano Rocha wrote: > > On Sun, Mar 23, 2008 at 01:38:41PM -0400, Theodore Tso wrote: > > > On Sun, Mar 23, 2008 at 10:15:48AM -0700, H. Peter Anvin wrote: > > > > 2. cg-restore > > > > > > > > Cogito separated "reset" and "restore". This is a syntactic sugar > > > > issue, but having to type "git reset --hard -- path" makes me > > > > nervous, especially since hitting Enter at the wrong time could have > > > > serious and irrevocable consequences. > > > > > > > > I also note that this particular use of "git reset" is actually > > > > undocumented, but it seems to work. > > > > > > I didn't think "git reset --hard -- <pathame>" was valid, since it's > > > not documented in the man page. > > > > > > I have the following in my path as "git-revert-file" (which is easier > > > to type and less dangerous than typing "git reset --hard -- <path>"): > > > > > > #!/bin/sh > > > # > > > prefix=$(git rev-parse --show-prefix) > > > > > > for i in $* > > > do > > > git show HEAD:$prefix$i > $i > > > done > > > > I use git checkout path ... > > > > Isn't that the same thing? > > Yes, it does the same. Note there is unfortunately no shorthand for > git show $arbitrary_commit:$path > $path Actually, git checkout $arbitrary_commit -- $path works (and puts the contents in the index). Somehow, I thought it didn't work... Mike -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
