Git Commands Flashcards: Everyday Workflow, Branching & Recovery

Practice essential Git commands with safe, current examples for staging, commits, branches, remotes, history, undoing changes, and recovery.

Über dieses Lernkartenset

Git commands are easier to remember when the prompt starts with a real situation: inspect a change, stage part of a file, move work onto a branch, update from a remote, or recover a commit that seemed lost.

What this deck practices

  • Situation → command: choose a practical Git command or safe command sequence for the state in front of you.
  • Command → effect: explain what a command reads or changes, including the working tree, index, branch, remote-tracking refs, or commit history.
  • Risk → safer choice: distinguish local cleanup from shared-history changes, and recognize when restore, revert, reset, reflog, or a force push needs extra care.
  • Output → next step: read common status, diff, log, bisect, stash, branch, tag, and worktree results well enough to continue.

The sequence starts with repository setup and observation, moves through staging and commits, then adds branches, remotes, integration, history, debugging, undo, and recovery. Related prompt directions are separated so the neighboring card doesn't give away the answer.

This deck covers 36 useful top-level commands with modern porcelain such as git switch and git restore. Common older git checkout and git reset <path> forms appear only as compatibility notes. It excludes hosting-service pull requests, GUIs, credentials, server administration, most low-level plumbing commands, hooks, signing, Git LFS, submodules, partial clones, custom aliases, and exhaustive option catalogs. The practical low-level exceptions are git ls-files, git merge-base, and git rev-parse, which support everyday inspection and comparison tasks.

CC0 applies to the independently authored questions, answers, organization, metadata, and generated cover only to the extent applicable rights exist; it doesn't license Git facts, documentation, names, or trademarks.

Facts and examples were checked against the current official Git documentation and executed in disposable repositories with Git 2.50.1. This is an independent, unofficial educational deck. It isn't affiliated with or endorsed by the Git Project or Software Freedom Conservancy. No documentation prose, logos, command tables, competitor cards, or assessment questions were copied.

Karten in diesem Lernkartenset

  1. Karte 1

    Frage

    Initialize the current directory as a Git repository.

    Antwort

    git init creates the repository metadata in the current directory.

    git init
    

    It doesn't add or commit the existing files.

  2. Karte 2

    Frage

    Set the commit email for only the current repository.

    Antwort

    git config user.email dev@example.com sets a repository-local value.

    git config user.email dev@example.com
    

    Omitting --global keeps other repositories unchanged.

  3. Karte 3

    Frage

    Open the full manual for git status.

    Antwort

    git help status opens the command's manual.

    git help status
    

    Use git status -h when you only need the short option summary in the terminal.

  4. Karte 4

    Frage

    Copy ../origin.git into a new local directory named project.

    Antwort

    git clone ../origin.git project creates the local clone in project.

    git clone ../origin.git project
    

    The clone normally configures the source as the origin remote.

  5. Karte 5

    Frage

    Show tracked changes that haven't been staged.

    Antwort

    git diff shows the working-tree changes relative to the index.

    git diff
    

    New untracked files don't appear until Git knows about them.

  6. Karte 6

    Frage

    Stage notes.txt for the next commit.

    Antwort

    git add notes.txt copies the path's current content into the index.

    git add notes.txt
    

    Later edits to the file stay unstaged until you add them too.

  7. Karte 7

    Frage

    Inspect which changes are staged, unstaged, or untracked.

    Antwort

    git status compares the working tree and index with HEAD.

    git status
    

    It reads repository state; it doesn't modify files or history.

  8. Karte 8

    Frage

    Record the staged snapshot with the message Add notes.

    Antwort

    git commit -m "Add notes" creates a commit from the index.

    git commit -m "Add notes"
    

    Unstaged changes aren't included.

  9. Karte 9

    Frage

    Delete the tracked file obsolete.txt and stage that deletion.

    Antwort

    git rm obsolete.txt removes the file and stages the removal.

    git rm obsolete.txt
    

    Commit afterward to record the deletion in history.

  10. Karte 10

    Frage

    Rename tracked old-name.txt to notes.txt and stage the change.

    Antwort

    git mv old-name.txt notes.txt moves the path and updates the index.

    git mv old-name.txt notes.txt
    

    Git records snapshots, so it detects the rename from the resulting content when useful.

  11. Karte 11

    Frage

    List local branches and show which one is current.

    Antwort

    git branch lists local branches and marks the current one with *.

    git branch
    

    It doesn't switch branches.

  12. Karte 12

    Frage

    Switch the working tree to the existing branch feature/login.

    Antwort

    git switch feature/login switches to that branch.

    git switch feature/login
    

    Git updates the index and working tree, and refuses if the switch would overwrite local work. Older instructions often use git checkout for branch switching; switch states the intent more clearly.

  13. Karte 13

    Frage

    Show every configured remote with its fetch and push URL.

    Antwort

    git remote -v lists remote names and URLs.

    git remote -v
    

    A remote name such as origin is a local shortcut, not a special server type.

  14. Karte 14

    Frage

    Read a compact one-line commit history.

    Antwort

    git log --oneline prints one abbreviated entry per commit.

    git log --oneline
    

    The newest reachable commit appears first.

  15. Karte 15

    Frage

    Discard unstaged edits to tracked notes.txt.

    Antwort

    git restore notes.txt replaces the working-tree file with the indexed version.

    git restore notes.txt
    

    This is destructive for those unstaged edits. Check git diff -- notes.txt first when unsure.

  16. Karte 16

    Frage

    Clone ../origin.git while naming the local directory sandbox.

    Antwort

    git clone ../origin.git sandbox separates the source location from the local directory name.

    git clone ../origin.git sandbox
    

    Run it from the parent directory where sandbox should be created.

  17. Karte 17

    Frage

    Read the effective commit email in the current repository.

    Antwort

    git config --get user.email prints the selected configuration value.

    git config --get user.email
    

    Repository-local configuration overrides a global value.

  18. Karte 18

    Frage

    Get a compact status that still shows branch information.

    Antwort

    git status --short --branch prints the branch line plus two-column path states.

    git status --short --branch
    

    The left column describes the index; the right column describes the working tree.

  19. Karte 19

    Frage

    Review what is staged for the next commit.

    Antwort

    git diff --staged compares the index with HEAD.

    git diff --staged
    

    --cached is the common equivalent spelling.

  20. Karte 20

    Frage

    Interactively stage selected hunks from notes.txt.

    Antwort

    git add -p notes.txt lets you accept or reject each patch hunk.

    git add -p notes.txt
    

    This is useful when one file contains changes for more than one commit.

  21. Karte 21

    Frage

    Open the configured editor to write a commit message for the staged snapshot.

    Antwort

    git commit opens the commit-message editor.

    git commit
    

    Git still commits only the staged content.

  22. Karte 22

    Frage

    Stop tracking local.env but keep the file in the working tree.

    Antwort

    git rm --cached local.env stages removal from the index without deleting the local file.

    git rm --cached local.env
    

    Add the path to an ignore rule if it shouldn't be staged again.

  23. Karte 23

    Frage

    Create feature/login at the current commit without switching to it.

    Antwort

    git branch feature/login creates the branch reference.

    git branch feature/login
    

    Use git switch -c feature/login when you want to create and switch in one step.

  24. Karte 24

    Frage

    Add ../upstream.git as a remote named upstream.

    Antwort

    git remote add upstream ../upstream.git stores that remote configuration.

    git remote add upstream ../upstream.git
    

    It doesn't fetch any refs until you run git fetch upstream.

  25. Karte 25

    Frage

    View a compact decorated commit graph across all local refs.

    Antwort

    git log --oneline --graph --decorate --all combines history, topology, and ref names.

    git log --oneline --graph --decorate --all
    

    It is a read-only way to understand how branches relate.

  26. Karte 26

    Frage

    Inspect the current commit's metadata and patch.

    Antwort

    git show HEAD displays the commit and its changes.

    git show HEAD
    

    Replace HEAD with another revision when needed.

  27. Karte 27

    Frage

    Create feature/search at the current commit and switch to it.

    Antwort

    git switch -c feature/search creates and checks out the branch.

    git switch -c feature/search
    

    New commits now advance feature/search.

  28. Karte 28

    Frage

    List the paths currently known to the index.

    Antwort

    git ls-files prints tracked and staged paths.

    git ls-files
    

    It is more precise than a filesystem listing when you need Git's view.

  29. Karte 29

    Frage

    Refresh remote-tracking refs from origin without integrating them.

    Antwort

    git fetch origin downloads objects and updates origin/* refs.

    git fetch origin
    

    Your current branch and working tree stay in place.

  30. Karte 30

    Frage

    Unstage notes.txt while keeping its working-tree edits.

    Antwort

    git restore --staged notes.txt restores the index entry from HEAD by default.

    git restore --staged notes.txt
    

    The file's edited content remains in the working tree.

  31. Karte 31

    Frage

    Temporarily store tracked work with the label WIP login.

    Antwort

    git stash push -m "WIP login" saves tracked staged and unstaged changes, then cleans them from the worktree.

    git stash push -m "WIP login"
    

    Untracked files stay put unless you add -u.

  32. Karte 32

    Frage

    Check how the current branch differs from its configured upstream.

    Antwort

    git status --branch reports ahead, behind, or diverged state when an upstream exists.

    git status --branch
    

    It doesn't contact the remote, so fetch first when freshness matters.

  33. Karte 33

    Frage

    Compare the snapshots at main and feature/login.

    Antwort

    git diff main feature/login shows changes needed to turn the first tree into the second.

    git diff main feature/login
    

    This compares the two named tips, not their merge base.

  34. Karte 34

    Frage

    Stage all additions, modifications, and deletions in the current repository.

    Antwort

    git add -A updates the index for every path in scope.

    git add -A
    

    Review git diff --staged before committing a broad change.

  35. Karte 35

    Frage

    Replace the current local commit with a corrected snapshot but keep its message.

    Antwort

    git commit --amend --no-edit creates a replacement commit from the current index.

    git commit --amend --no-edit
    

    Amending rewrites the commit ID. Avoid it after sharing the commit unless the team expects a history update.

  36. Karte 36

    Frage

    Rename the current branch to feature/auth.

    Antwort

    git branch -m feature/auth renames the checked-out branch.

    git branch -m feature/auth
    

    If the old name was already pushed, coordinate the remote rename separately.

  37. Karte 37

    Frage

    Return to the branch you were on immediately before this one.

    Antwort

    git switch - switches to the previously checked-out branch.

    git switch -
    

    It is handy for moving between two branches.

  38. Karte 38

    Frage

    Integrate feature/login into the current branch.

    Antwort

    git merge feature/login joins the named branch into the current branch.

    git merge feature/login
    

    The result may be a fast-forward, merge commit, or conflict, depending on history and options.

  39. Karte 39

    Frage

    Fetch only the main branch from origin.

    Antwort

    git fetch origin main downloads that branch and records the fetched tip in FETCH_HEAD.

    git fetch origin main
    

    It doesn't merge or move your current branch.

  40. Karte 40

    Frage

    Update the current branch only when the remote change can fast-forward it.

    Antwort

    git pull --ff-only fetches, then refuses to create a merge commit or rebase.

    git pull --ff-only
    

    A refusal leaves the divergent histories for you to inspect.

  41. Karte 41

    Frage

    Push the current branch feature/login to origin.

    Antwort

    git push origin feature/login updates the same-named remote branch.

    git push origin feature/login
    

    It doesn't configure an upstream unless your settings do that automatically.

  42. Karte 42

    Frage

    Read commits that changed notes.txt.

    Antwort

    git log -- notes.txt limits history to commits affecting that path.

    git log -- notes.txt
    

    The -- separates revisions and options from the path.

  43. Karte 43

    Frage

    Print notes.txt exactly as it exists in HEAD without switching commits.

    Antwort

    git show HEAD:notes.txt reads the blob at that revision and path.

    git show HEAD:notes.txt
    

    This doesn't modify the working-tree file.

  44. Karte 44

    Frage

    Search tracked working-tree files for the text TODO, including unstaged edits.

    Antwort

    git grep TODO searches tracked files in the working tree, including their unstaged content.

    git grep TODO
    

    It skips untracked files by default.

  45. Karte 45

    Frage

    Show the commit and author associated with each line of notes.txt.

    Antwort

    git blame notes.txt annotates each line with its last recorded change.

    git blame notes.txt
    

    Use it as a history lead, not as proof that one person owns the current behavior.

  46. Karte 46

    Frage

    Move the current branch back one commit while keeping the changes unstaged.

    Antwort

    git reset HEAD~1 performs the default mixed reset.

    git reset HEAD~1
    

    It rewrites the local branch tip but leaves the changed files in the working tree.

  47. Karte 47

    Frage

    Stash tracked and untracked work together with the label WIP search.

    Antwort

    git stash push -u -m "WIP search" includes untracked files.

    git stash push -u -m "WIP search"
    

    Ignored files still stay out unless you deliberately use the stronger --all option.

  48. Karte 48

    Frage

    List local tags whose names start with v1..

    Antwort

    git tag --list "v1.*" filters the local tag names.

    git tag --list "v1.*"
    

    Listing tags doesn't contact a remote.

  49. Karte 49

    Frage

    Resolve HEAD to its full object ID.

    Antwort

    git rev-parse HEAD prints the object name selected by the revision.

    git rev-parse HEAD
    

    This is useful in scripts that need an exact commit ID.

  50. Karte 50

    Frage

    Review prose edits as changed words instead of whole lines.

    Antwort

    git diff --word-diff highlights inline word-level changes.

    git diff --word-diff
    

    It changes the display only; repository state stays untouched.

  51. Karte 51

    Frage

    Integrate feature/login only if the current branch can fast-forward.

    Antwort

    git merge --ff-only feature/login refuses histories that require a merge commit.

    git merge --ff-only feature/login
    

    The refusal is a safety check, not a partial merge.

  52. Karte 52

    Frage

    Fetch origin and remove remote-tracking refs that the remote no longer has.

    Antwort

    git fetch --prune origin refreshes refs and prunes stale origin/* names.

    git fetch --prune origin
    

    It doesn't delete local branches.

  53. Karte 53

    Frage

    List commits reachable from feature/login but not from main.

    Antwort

    git log main..feature/login --oneline shows that one-sided revision range.

    git log main..feature/login --oneline
    

    The order around .. matters.

  54. Karte 54

    Frage

    Replace working-tree notes.txt with its version from HEAD~1.

    Antwort

    git restore --source=HEAD~1 notes.txt copies the older blob into the working tree.

    git restore --source=HEAD~1 notes.txt
    

    This overwrites current unstaged edits to notes.txt. Diff, copy, or otherwise protect wanted edits first; then review and stage the restored version if you want to keep it.

  55. Karte 55

    Frage

    Create branch hotfix in an additional working tree at ../hotfix.

    Antwort

    git worktree add ../hotfix -b hotfix creates the branch and checks it out there.

    git worktree add ../hotfix -b hotfix
    

    The original working tree stays on its current branch.

  56. Karte 56

    Frage

    Push feature/login and configure origin/feature/login as its upstream.

    Antwort

    git push -u origin feature/login pushes the branch and records upstream tracking.

    git push -u origin feature/login
    

    Later git status, git pull, and git push can use that relationship.

  57. Karte 57

    Frage

    Follow likely moved or copied lines while blaming notes.txt.

    Antwort

    git blame -M -C notes.txt adds move and copy detection heuristics.

    git blame -M -C notes.txt
    

    The result is still a clue for investigation, not an ownership verdict.

  58. Karte 58

    Frage

    Replay the current branch's local commits on top of main.

    Antwort

    git rebase main rewrites those commits onto the new base.

    git rebase main
    

    Use it on unshared work, or coordinate before rewriting commits other people may use.

  59. Karte 59

    Frage

    Move the branch back one commit while keeping all reverted changes staged.

    Antwort

    git reset --soft HEAD~1 moves HEAD but leaves the index and working tree intact.

    git reset --soft HEAD~1
    

    This rewrites the local branch tip and is best kept to unshared history.

  60. Karte 60

    Frage

    Create an annotated release tag v1.0.0 at the current commit.

    Antwort

    git tag -a v1.0.0 -m "Release 1.0.0" creates a tag object with a message.

    git tag -a v1.0.0 -m "Release 1.0.0"
    

    Tags aren't pushed automatically unless you push them explicitly.

  61. Karte 61

    Frage

    Start a regression search with HEAD known bad and HEAD~4 known good.

    Antwort

    git bisect start, followed by bad and good boundaries, begins binary search through the range.

    git bisect start
    git bisect bad HEAD
    git bisect good HEAD~4
    

    Git checks out a midpoint for you to test.

  62. Karte 62

    Frage

    Fetch the upstream branch, then replay local commits on top of it.

    Antwort

    git pull --rebase combines fetch with a rebase-based integration.

    git pull --rebase
    

    It rewrites local commits, so inspect the branch and keep shared-history expectations in mind.

  63. Karte 63

    Frage

    Commit the staged update as Update notes while leaving unstaged edits out.

    Antwort

    git commit -m "Update notes" records the index, not every working-tree edit.

    git commit -m "Update notes"
    

    Review both git diff --staged and git diff when the split matters.

  64. Karte 64

    Frage

    Undo the current non-merge commit with a new commit instead of moving the branch backward.

    Antwort

    git revert HEAD applies the inverse of the current non-merge commit and records it as a new commit.

    git revert HEAD
    

    For a merge commit, inspect its parents and use the mainline form taught later: git revert -m <parent-number> <merge-commit>. Revert preserves shared history, which usually makes it safer than reset for published commits.

  65. Karte 65

    Frage

    Delete the fully merged local branch feature/login.

    Antwort

    git branch -d feature/login deletes the branch only when Git considers it merged.

    git branch -d feature/login
    

    The lowercase -d guard helps prevent accidental loss of unmerged branch tips.

  66. Karte 66

    Frage

    Inspect HEAD~1 without moving any branch name.

    Antwort

    git switch --detach HEAD~1 checks out the commit in detached-HEAD mode.

    git switch --detach HEAD~1
    

    Create a branch before leaving if you make commits you want to keep.

  67. Karte 67

    Frage

    Find one best common ancestor of main and feature/login.

    Antwort

    git merge-base main feature/login prints one best merge base.

    git merge-base main feature/login
    

    Criss-cross histories can have multiple equally best bases. Use git merge-base --all main feature/login when every best base matters; without --all, Git chooses one unspecified best base.

  68. Karte 68

    Frage

    Print the top-level directory of the current working tree.

    Antwort

    git rev-parse --show-toplevel resolves the repository root path.

    git rev-parse --show-toplevel
    

    It fails outside a working tree, which is useful in scripts that require one.

  69. Karte 69

    Frage

    Inspect recent local movements of HEAD.

    Antwort

    git reflog --oneline shows the local reference-update history in compact form.

    git reflog --oneline
    

    It can reveal commits hidden by reset or rebase while their objects still exist.

  70. Karte 70

    Frage

    List stashes, then summarize the newest stash's changed paths.

    Antwort

    git stash list names the entries, and git stash show --stat stash@{0} summarizes the newest one.

    git stash list
    git stash show --stat stash@{0}
    

    Neither command removes or applies the stash.

  71. Karte 71

    Frage

    Apply the tip commit from feature/login without conflicts and record where it came from.

    Antwort

    git cherry-pick -x feature/login applies the commit and, when it applies without conflicts, adds a source-commit line to the message.

    git cherry-pick -x feature/login
    

    Use -x when the trace is useful and the picked commit is public enough to name.

  72. Karte 72

    Frage

    Preview which untracked files under scratch/ Git would delete.

    Antwort

    git clean -nd -- scratch/ performs a scoped dry run.

    git clean -nd -- scratch/
    

    Run the preview before replacing -n with -f; ignored files aren't included here.

  73. Karte 73

    Frage

    Identify conflicted paths after a merge stops.

    Antwort

    git status --short marks unmerged paths with combinations such as UU.

    git status --short
    

    Resolve each path, stage the result, then complete the merge commit—or abort the merge.

  74. Karte 74

    Frage

    Continue a rebase after resolving and staging its conflicts.

    Antwort

    git rebase --continue records the resolved step and moves to the next commit.

    git rebase --continue
    

    If the resolution is wrong or the rewrite is no longer wanted, abort instead.

  75. Karte 75

    Frage

    List every working tree attached to the repository.

    Antwort

    git worktree list shows each path, checked-out commit, and branch when attached.

    git worktree list
    

    A branch normally can't be checked out in two worktrees at once.

  76. Karte 76

    Frage

    Fetch and integrate the upstream with merge semantics rather than rebase.

    Antwort

    git pull --no-rebase fetches, then merges the selected upstream.

    git pull --no-rebase
    

    Use an explicit policy so the integration behavior isn't a surprise.

  77. Karte 77

    Frage

    Interactively discard selected unstaged hunks from notes.txt.

    Antwort

    git restore -p notes.txt asks which working-tree hunks to restore from the index.

    git restore -p notes.txt
    

    Accepted hunks are discarded, so review each prompt carefully.

  78. Karte 78

    Frage

    Delete the remote branch feature/login from origin.

    Antwort

    git push origin --delete feature/login removes that remote ref.

    git push origin --delete feature/login
    

    It doesn't delete anyone's local branch or existing commits immediately.

  79. Karte 79

    Frage

    Mark HEAD~4 as a known good boundary during a bisect session.

    Antwort

    git bisect good HEAD~4 tells Git that the named commit doesn't contain the bug.

    git bisect good HEAD~4
    

    Git uses good and bad boundaries to choose the next midpoint.

  80. Karte 80

    Frage

    Delete the local tag v1.0.0.

    Antwort

    git tag -d v1.0.0 removes the local tag reference.

    git tag -d v1.0.0
    

    A remote copy, if any, needs a separate remote update.

  81. Karte 81

    Frage

    Move the branch back one commit and discard the index and working-tree changes.

    Antwort

    git reset --hard HEAD~1 makes the branch, index, and tracked working tree match HEAD~1.

    git reset --hard HEAD~1
    

    This is destructive. It can also delete or overwrite untracked files or directories that obstruct paths tracked by the target commit. Confirm the target and move wanted work first.

  82. Karte 82

    Frage

    Give the current commit a human-readable name based on reachable tags.

    Antwort

    git describe --tags --always uses the nearest tag when possible and falls back to an object name.

    git describe --tags --always
    

    It reads history without creating or moving a tag.

  83. Karte 83

    Frage

    Continue a cherry-pick after resolving and staging its conflicts.

    Antwort

    git cherry-pick --continue finishes the current picked commit.

    git cherry-pick --continue
    

    Git may continue to another commit if the original request included a sequence.

  84. Karte 84

    Frage

    Delete ordinary, non-ignored untracked files and directories only under scratch/.

    Antwort

    git clean -fd -- scratch/ removes ordinary, non-ignored untracked files and directories under that path.

    git clean -fd -- scratch/
    

    It leaves ignored content and nested Git repositories in place. This can't be recovered through normal Git history, so run the matching dry run first.

  85. Karte 85

    Frage

    Apply the inverse of the current non-merge commit to the index and working tree without committing yet.

    Antwort

    git revert --no-commit HEAD prepares the inverse of the current non-merge commit for inspection.

    git revert --no-commit HEAD
    

    For a merge commit, inspect its parents and use the mainline form taught later: git revert -m <parent-number> <merge-commit>. You can combine or edit the prepared change before creating a commit.

  86. Karte 86

    Frage

    Apply the newest stash while keeping it in the stash list.

    Antwort

    git stash apply stash@{0} reapplies the entry without dropping it.

    git stash apply stash@{0}
    

    Use pop only when you want a successful apply to remove the entry automatically.

  87. Karte 87

    Frage

    Create branch recovered at the previous recorded location of HEAD.

    Antwort

    git branch recovered HEAD@{1} gives the reflog entry a durable branch name.

    git branch recovered HEAD@{1}
    

    Inspect the entry first; reflog positions change as new reference updates happen.

  88. Karte 88

    Frage

    Abandon the current conflicted merge and return to its pre-merge state.

    Antwort

    git merge --abort stops the in-progress merge.

    git merge --abort
    

    Uncommitted changes that predated the merge can make exact reconstruction harder, so start risky merges from a clear state.

  89. Karte 89

    Frage

    Unstage notes.txt with the older path-specific reset form.

    Antwort

    git reset HEAD -- notes.txt resets only the index entry and keeps working-tree edits.

    git reset HEAD -- notes.txt
    

    Modern instructions usually prefer git restore --staged notes.txt for this job.

  90. Karte 90

    Frage

    Remove the clean linked working tree at ../hotfix.

    Antwort

    git worktree remove ../hotfix removes that working tree and its administrative record.

    git worktree remove ../hotfix
    

    It refuses a dirty working tree unless you force it; inspect and save work instead of forcing by habit.

  91. Karte 91

    Frage

    Force-update feature/login only if its remote tip matches your local origin/feature/login expectation.

    Antwort

    git push --force-with-lease origin feature/login compares the remote branch with the local remote-tracking ref before force-updating.

    git push --force-with-lease origin feature/login
    

    Background or automatic fetches can move that local ref and weaken the check. Inspect the fetched tip, coordinate the rewrite, and use an explicit <ref>:<expect> lease when exact protection matters.

  92. Karte 92

    Frage

    Abandon the current rebase and restore the branch to its pre-rebase state.

    Antwort

    git rebase --abort stops the rewrite and restores the original branch tip.

    git rebase --abort
    

    Use it when the conflict resolution or rewrite plan isn't worth continuing.

  93. Karte 93

    Frage

    Revert the current merge commit while keeping its first parent as the mainline.

    Antwort

    git revert -m 1 HEAD creates an inverse change relative to parent 1.

    git revert -m 1 HEAD
    

    Choosing the wrong mainline changes the meaning, so inspect the merge's parents first. Its ancestors remain integrated in history, which means a later merge may not restore the reverted tree changes automatically.

  94. Karte 94

    Frage

    End a bisect session and return to the branch or commit checked out before it.

    Antwort

    git bisect reset restores the pre-bisect checkout.

    git bisect reset
    

    Run it after identifying the first bad commit or when abandoning the search.

  95. Karte 95

    Frage

    Read the reflog specifically for HEAD.

    Antwort

    git reflog show HEAD displays local movements recorded for HEAD.

    git reflog show HEAD
    

    Reflogs are local recovery records; they aren't a shared remote audit log.

  96. Karte 96

    Frage

    Abandon the current conflicted cherry-pick.

    Antwort

    git cherry-pick --abort restores the state from before the cherry-pick sequence.

    git cherry-pick --abort
    

    Use it instead of stacking unrelated cleanup commands onto a failed pick.

  97. Karte 97

    Frage

    Interactively edit the last three local commits before sharing them.

    Antwort

    git rebase -i HEAD~3 opens a plan for reordering, editing, squashing, or dropping those commits.

    git rebase -i HEAD~3
    

    Every changed commit gets a new ID. Keep interactive rebase to unshared work unless everyone has coordinated.

  98. Karte 98

    Frage

    Run ./test.sh automatically at each midpoint of an active bisect.

    Antwort

    git bisect run ./test.sh classifies commits from the script's exit status.

    git bisect run ./test.sh
    

    The test must be deterministic: exit 0 for good, 1–127 except 125 for bad, and 125 to skip an untestable commit.

Abstract branching commit graph on a dark terminal-inspired background.

98 Karten

Git Commands Flashcards: Everyday Workflow, Branching & Recovery

Mit diesem Lernkartenset kostenlos lernen

Flashcards wird geöffnet, damit du mit dem Lernen beginnen kannst.