How about git reset / reset ?