Comandi Git

Una guida pratica ai comandi Git che usi ogni giorno: creare branch, annullare modifiche, fare merge e rebase e sincronizzarti con un remote. Ogni comando ha la sua sintassi, le opzioni che contano ed esempi da copiare ed eseguire dal vivo nel playground del terminale.

Preferisci una pagina unica da stampare? Guarda la cheat sheet di Git.

Setup e configurazione

Crea un repository e configura Git: init, config, remote.

git initCreate a new Git repository in the current folder.git remoteList, add, rename, and change the remote repositories your repo points at.git submoduleEmbed one repository inside another and keep it pinned to a specific commit.git cloneCopy a remote repository, with all its history, to your machine.git clone branchClone only a specific branch of a repository, or a single branch only.git configSet your name, email, editor, and other Git settings - globally or per repo.

Staging e commit

Registra le modifiche nella cronologia: add, commit e amend.

git commitRecord staged changes into the project history with a message.git commit --amendFix the most recent commit - change its message or add forgotten files.git addStage changes for the next commit - a file, everything, or selected chunks.

Branch

Crea, cambia, rinomina ed elimina branch per lavorare alle modifiche in modo isolato.

git delete local branchDelete a local branch once its work is merged - and force-delete when it is not.git rename branchRename the branch you are on, or any other branch, locally and on the remote.git create branchCreate a new branch and switch to it, from the current commit or any starting point.git checkoutSwitch branches, restore files, or check out a specific commit.git checkout remote branchFetch and check out a branch that exists on the remote but not yet locally.git branchList, create, rename, and delete branches - the core branch command.git worktreeCheck out multiple branches at once in separate working directories.

Annullare le modifiche

Rimedia agli errori: reset, revert e annullamento dei commit in sicurezza.

git undo commitUndo any commit - an older one, several at once, or one that is already pushed.git resetMove HEAD and choose what happens to the index and working tree: --soft, --mixed, --hard.git revertUndo a commit safely by adding a new commit that reverses it - the right choice for pushed history.git undo last commitUndo just the most recent commit - keep the work, discard it, or reverse it if it was pushed.git reset --hardForce your branch and working tree back to a commit, discarding all changes since it.git stashShelve your uncommitted changes so you can switch context, then reapply them later.git reflogSee everywhere HEAD has been - and recover commits you thought were lost.

Merge e rebase

Unisci il lavoro di due branch con merge, rebase, squash e cherry-pick.

git rebase vs mergeTwo ways to combine branches: a merge commit that preserves history, or a linear replay.git squash commitsCombine several commits into one with interactive rebase for a clean history.git abort mergeCancel a merge in progress and return the branch to the state before you started.git cherry-pickApply a specific commit from one branch onto another, without merging the whole branch.git mergeCombine another branch into your current one, with or without a merge commit.git rebaseReplay your commits on top of another branch for a clean, linear history.

Remote

Sincronizza il tuo repository locale con un remote come GitHub: push, pull, fetch.

git fetch vs pullThe difference between downloading remote changes and downloading-and-merging them.git force pushOverwrite the remote branch with your local history - and do it safely with --force-with-lease.git pullDownload remote changes and merge them into your current branch in one step.git pushUpload your commits to a remote and set the upstream branch.git delete remote branchDelete a branch on the remote (GitHub) once it is merged - and locally too.git set upstreamLink a local branch to a remote branch so push and pull need no arguments.git pull remote branchPull changes from a specific remote branch into your current branch.

Ispezione e pulizia

Guarda cosa è cambiato e pulisci il working tree: status, log, diff, clean.

git remove untracked filesClean untracked files and directories out of the working tree with git clean.git tagMark a commit with a version tag, and push tags to the remote.git statusSee which files are staged, modified, or untracked in your working tree.git diffSee exactly what changed - unstaged, staged, between commits or branches.git bisectBinary-search your history to find the commit that introduced a bug.git logBrowse commit history, with a compact one-line and graph view.

Annullare le modifiche: quale comando usare?

Quattro comandi annullano il lavoro in modi diversi. Scegli in base a cosa vuoi conservare e se il commit è già stato pushato:

git reset - sposta indietro il tuo branch e riscrive la cronologia. Ideale per commit locali non ancora pushati.
git revert - aggiunge un nuovo commit che annulla uno precedente. La scelta sicura per commit che altri hanno già scaricato.
git checkout - cambia branch o ripristina un file a una versione precedente.
git stash - mette da parte le modifiche senza fare commit, per riapplicarle in seguito.