Menu

Tech

EMPEZAR A APRENDER

Español

Comandos de Git

Una referencia práctica de los comandos de Git que usas todos los días: crear ramas, deshacer, fusionar y hacer rebase, y sincronizar con un remoto. Cada comando incluye su sintaxis, los flags que importan y ejemplos para copiar y pegar que puedes ejecutar en vivo en el playground de terminal.

¿Prefieres una hoja de una sola página para imprimir? Consulta la hoja de referencia de Git.

Configuración e inicio

Inicia un repositorio y configura Git: init, config, remotes.

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.

Preparación y commit

Registra los cambios en el historial: add, commit y 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.

Ramas

Crea, cambia, renombra y elimina ramas para trabajar en tus cambios de forma aislada.

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.

Deshacer cambios

Recupérate de los errores: reset, revert y deshaz commits de forma segura.

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 y rebase

Combina el trabajo de dos ramas con merge, rebase, squash y 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.

Remotos

Sincroniza tu repositorio local con un remoto como 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.

Inspección y limpieza

Consulta qué cambió y limpia el árbol de trabajo: 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.

Deshacer cambios: ¿qué comando?

Cuatro comandos deshacen el trabajo de formas distintas. Elige según lo que quieras conservar y si el commit ya está subido:

git reset - retrocede tu rama y reescribe el historial. Ideal para commits locales que aún no se han subido.
git revert - añade un nuevo commit que deshace uno anterior. La opción segura para commits que otros ya han descargado.
git checkout - cambia de rama o restaura un archivo a una versión anterior.
git stash - aparta los cambios sin hacer commit y vuelve a aplicarlos más tarde.