Undo changes safely — Git Hoofdstuk 2

Dit deel is nog niet vertaald. Je ziet de Engelse tekst.

$ als gewone gebruiker# als root (of met sudo)

Undo changes in files

git restore throws away changes in the working tree, or takes a file out of the staging area.

$git restore main.tf
$git restore --staged main.tf
$git restore --source=HEAD~2 variables.tf
$git clean -n
$git clean -fd

Command	Effect
`git restore FILE`	Back to the last staged/committed version (changes lost)
`git restore --staged FILE`	Unstage, keep the changes
`git restore --source=COMMIT FILE`	Get the file from any commit
`git clean -n` / `-fd`	Show / delete untracked files and folders

Let op

git restore and git clean -f delete work that was never committed — there is no undo for that.

2.2

Fix the last commit

Forgot a file or wrote a bad message? --amend replaces the last commit — only if it is not pushed yet.

$git add forgotten.tf
$git commit --amend --no-edit
$git commit --amend -m "Better message"

2.3

Move a branch back with reset

git reset moves the branch pointer to an older commit. The mode decides what happens to your files.

$git reset --soft HEAD~1
$git reset HEAD~1
$git reset --hard HEAD~1
$git reset --hard origin/main

Mode	Commits after the target	Staging area	Working tree
`--soft`	Removed	Keeps the changes (staged)	Kept
`--mixed` (default)	Removed	Cleared	Kept (changes unstaged)
`--hard`	Removed	Cleared	Reset — changes lost

2.4

Undo a pushed commit with revert

git revert makes a new commit that does the opposite of an old one. History stays intact — safe on shared branches.

$git log --oneline -5
$git revert 3f2a9c1
$git revert --no-edit HEAD
$git revert -m 1 MERGE_COMMIT
$git push

Onthoud

Pushed = shared. On shared branches use revert, never reset + force push.

2.5

Find "lost" commits with reflog

The reflog records where HEAD was. After a bad reset or rebase, the old commits are still there for some weeks.

$git reflog
3f2a9c1 HEAD@{0}: reset: moving to HEAD~3
8b7c6d5 HEAD@{1}: commit: Add monitoring module
$git reset --hard HEAD@{1}
$git branch rescue 8b7c6d5

Op het werk

Before a risky operation, make a backup branch: git branch backup-before-rebase. It costs nothing.

Alle commando's in dit hoofdstuk

git