· 3 min read

Learn Git in Spanish: 68 Flashcards on Commands, Merges and the Object Store

Spanish edition of the 68-card Git deck: commands, merge strategies and object store, with the three backs to correct before your first review.

Flat vector illustration of glowing Git branch lines diverging and merging above layered discs, surrounded by floating flashcards

Studying. But it's also a video game. 🎮

Flashcards, quizzes and games that make you actually remember.

Start playing — it's free

Posted by

Deck SD3808 — "Git: Comandos y Flujos de Trabajo" is the Spanish edition of a 68-card Git deck. The fronts stay in English, which is correct: git rebase is git rebase in every language, and so are HEAD, blob and fast-forward. Every back is written in Spanish. That makes it a double-duty deck — the Git model in one column, the vocabulary a Spanish-speaking team actually uses in code review in the other.

Study this deck: Git: Comandos y Flujos de Trabajo

1 / 10
Question

Git

Knew itLearning

Tap the card for the answer · swipe right if you knew it, left if not

Sample cards (backs are the deck's own Spanish)

FrontBack
git reset --hardRestablece el directorio de trabajo y el área de preparación para que coincidan con un commit específico, descartando todos los cambios
git switchComando moderno para cambiar de rama (alternativa más clara a checkout)
git cleanElimina archivos sin seguimiento del directorio de trabajo
git blameMuestra quién modificó por última vez cada línea de un archivo y cuándo
Git staging areaUn área intermedia (también llamada índice o caché) donde se preparan los cambios antes de confirmarlos
Merge conflictCuando Git no puede fusionar automáticamente los cambios porque las mismas líneas se modificaron de formas distintas
Three-way merge algorithmLa estrategia de fusión tradicional de Git que utiliza las puntas de dos ramas y su ancestro común
Git LFSGit Large File Storage: una extensión para versionar archivos grandes de forma eficiente

What the 68 cards cover

Commands: init, clone, add, commit and commit -m, status, push, pull, fetch, merge, branch, branch [name], checkout, checkout -b, switch, restore, log, diff, reset, reset --hard, revert, stash, stash pop, remote, remote add origin, tag, rebase, cherry-pick, rm, mv, blame, bisect, grep, gc, fsck, config, archive, clean, describe, reflog. Concepts: HEAD and detached HEAD, origin, master versus main, blob, tree and tag objects, packfiles, delta compression, SHA-1, .gitignore, the staging area, pull requests, merge conflicts, three-way, recursive and octopus merges, fast-forward, git-flow, Git LFS, JGit, libgit2, BitKeeper's 2002–2005 reign, and the hosts (GitHub, GitLab, Bitbucket, SourceForge).

Three cards to correct before your first review

Card 52 counts wrong. It lists "cinco tipos de objetos: blob, tree, commit, tag y packfile". Git's object store has four types. A packfile is a container of objects — the very next card says so. Edit the back to four and the model finally clicks.

The commit object has no card. Blob, tree and tag each get a definition; commit — the object you create a dozen times a day — only ever appears as a word inside other answers. Write it: a commit points to one tree, to zero or more parents, and carries author, date and message.

"La estrategia predeterminada" is out of date. Recursive was Git's default merge strategy until Git 2.34 (2021) replaced it with ort — same results, far faster on large histories. Add hasta Git 2.33 to that card, and note that octopus is the default only when merging more than two branches at once.

The "flujos de trabajo" half of the title

Exactly one card describes a workflow: git-flow. No trunk-based development, no forking model, and — although one card defines a merge conflict — nothing showing how to resolve one. Write four cards yourself: git merge --abort, the anatomy of conflict markers (<<<<<<<, =======, >>>>>>>), git rebase -i for squashing, and your own team's branch naming. That is the half of the deck the title promised.

Spanish worth keeping

The backs are consistent where it matters: área de preparación (staging area), rama (branch), fusionar and fusión (merge), confirmar (to commit), etiqueta (tag), archivos sin seguimiento (untracked files), reescribir el historial, ancestro común, avanzar el puntero. Read them aloud — those are the phrases you will hear in a Spanish-language standup, and no command manual teaches them. All 68 hint fields are empty, which leaves free slots for your own remote names and branch prefixes.

Deck SD3808 is in the library at flip-it.app.

Also in Git & Tools: Learn Git without panic (English deck) · Study Git in French

Ready to learn faster? 🚀

Join FLIP IT for free and turn studying into a game.

Create my free account