Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

Careful here… if <target> is not in the ancestry of HEAD, resetting to it may have the effect of undoing any changes that have happened on the <target> branch that aren’t in yours.

To be safe, you can do:

    git reset $(git merge-base <target> HEAD)
Which puts HEAD at the last commit in common between your branch and <target>… which, if target is already a parent/ancestor of your commit, is the same thing. But if target has had changed since you branched from it, this prevents you from undoing any recent commits.


Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: