Confirmed users
1,643
edits
Cjku/git: Difference between revisions
→reset and checkout
| Line 319: | Line 319: | ||
#* working directory keeps untouched. | #* working directory keeps untouched. | ||
#* scenario: cherry-pick. | #* scenario: cherry-pick. | ||
# hard option: change the referee of the current branch; regenerate index according to the tree of the new assign commit object; Overwrite all '''modified''' tracked files in working directory. (Note: only tracked and dirty files will be overwritten by reset | # hard option: change the referee of the current branch; regenerate index according to the tree of the new assign commit object; Overwrite all '''modified''' tracked files in working directory. (Note: only tracked and dirty files will be overwritten by hard-reset. Unchanged and untracked files are out of scope) | ||
#* scenario: Overtime working, did lots of stupid things | #* scenario: Overtime working, did lots of stupid things | ||
#* scenario: clearing out failed or stale merge | #* scenario: clearing out failed or stale merge | ||