rebase reset revert cherrypick

헷갈리기시작