Bill Lear <rael@xxxxxxxxxx> writes:
> I have not yet figured this one out: I have not tagged anything, but
> know that I checked in something lame sometime between now and two days
> ago. How do I get my working repo to be that as it was, say, yesterday?
>
> Do I do:
>
> % git log --since="2 days ago"
>
> parse, the output for the commit I want, and then do
>
> % git reset <SHA>
>
> or would I do
>
> % git reset --soft <SHA>
>
> or something else?
Do you mean you have something like this:
---o---o---o---o---o---*---o---o HEAD
^ ^
two days lame
ago
and want to revert the lame one, or do you mean
---o---o---o---o---o---*---*---* HEAD
^ ^ ^ ^
two days lame
ago
all are lame after certain point and want to discard all of
them?
If the latter, probably "reset --hard <first-lame-one>^" (i.e.
the parent of the first lame one) is what you want.
If the former, you may want to "git revert <lame>" or "git
rebase --onto <lame>^ <lame>".
-
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