Reset

[rogerxu]

Soft

Remove last local commit but saving local changes.

$ git reset --soft HEAD^

Hard

Reset all local changes and rollback to HEAD.

$ git reset --hard HEAD^

[rogerxu]

Staged

Keep files in work directory and remove from the index.

$ git rm --cached {{file_path}}

[rogerxu]

Merge

Abort local merge.

$ git reset --merge

[rogerxu]

clean

Remove untracked local files.

$ git clean -f -d