Re: Reverting an uncommitted revert
On Wed, 20 May 2009, Wincent Colaiuta wrote:
Show 19 quoted lines
> El 20/5/2009, a las 5:35, Nicolas Pitre escribió:
>
> > Having a "trash" reflog would solve this unambiguously. That could also
> > include your index example above. However, in the index case, I'd
> > record a reflog entry only if you're about to discard a previously non
> > committed entry. If you do:
> >
> > $ git add foo
> > $ git add bar
> > $ git commit
> > $ hack hack hack
> > $ git add foo
> >
> > then in this case there is nothing to be lost hence no additional entry
> > in the "trash" reflog.
>
> That's true in the example you provide, but it doesn't really handle Jeff's
> initial example ("git add" twice on the same file), where it is possible to
> throw away intermediate state (by overwriting).Did I disagree with Jeff's original example?
Nicolas