Kaip grąžinti pakeitimus „Git

Question

Accepted Answer

Git siūlo kelis būdus **grąžinti pakeitimus** priklausomai nuo situacijos — atmesti nepatvirtintus pakeitimus, iškelti iš staging, pataisyti paskutinį commit, atšaukti commit arba reset. Žinoti tinkamą įrankį kiekvienai situacijai yra svarbus, praktinis įgūdis. ## Grąžinti nepatvirtintus pakeitimus (darbo katalogas) ```bash git restore # discard unstaged changes to a file (revert to last commit) git checkout -- # older equivalent git restore . # discard ALL unstaged changes (careful!) git clean -fd # remove untracked files/directories ``` ## Iškelti iš staging (palikti pakeitimus, tik iškelti) ```bash git restore --staged # unstage a file (changes stay in working dir) git reset # older equivalent ``` ## Pataisyti arba papildyti paskutinį commit ```bash git commit --amend -m "New message" # change the last commit's message git commit --amend # add staged changes to the last commit # ⚠️ amend REWRITES the commit — don't amend commits already pushed/shared ``` ## Atšaukti patvirtintą pakeitimą ```text TWO main approaches: REVERT → creates a NEW commit that undoes a previous commit (SAFE for shared history) git revert → history preserved; the undo is itself a commit RESET → moves the branch pointer BACK (rewrites history — for LOCAL commits only) git reset --soft HEAD~1 → undo commit, KEEP changes staged git reset --mixed HEAD~1 → undo commit, keep changes unstaged (default) git reset --hard HEAD~1 → undo commit AND DISCARD changes (⚠️ destructive!) ``` ## revert vs reset (kritinis pasirinkimas) ```text REVERT → safe for PUBLIC/shared commits (adds a new undoing commit; doesn't rewrite history) RESET → rewrites history (only for LOCAL, unpushed commits; never on shared branches) → Rule: use REVERT to undo commits others may have; RESET only for local cleanup. ``` ## Kodėl tai svarbu Žinoti, kaip grąžinti pakeitimus „Git