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.
Σχετικά με αυτήν τη δέσμη
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.
Κάρτες σε αυτήν τη δέσμη
Κάρτα 1
Ερώτηση
Initialize the current directory as a Git repository.
Απάντηση
git initcreates the repository metadata in the current directory.git initIt doesn't add or commit the existing files.
Κάρτα 2
Ερώτηση
Set the commit email for only the current repository.
Απάντηση
git config user.email dev@example.comsets a repository-local value.git config user.email dev@example.comOmitting
--globalkeeps other repositories unchanged.Κάρτα 3
Ερώτηση
Open the full manual for
git status.Απάντηση
git help statusopens the command's manual.git help statusUse
git status -hwhen you only need the short option summary in the terminal.Κάρτα 4
Ερώτηση
Copy
../origin.gitinto a new local directory namedproject.Απάντηση
git clone ../origin.git projectcreates the local clone inproject.git clone ../origin.git projectThe clone normally configures the source as the
originremote.Κάρτα 5
Ερώτηση
Show tracked changes that haven't been staged.
Απάντηση
git diffshows the working-tree changes relative to the index.git diffNew untracked files don't appear until Git knows about them.
Κάρτα 6
Ερώτηση
Stage
notes.txtfor the next commit.Απάντηση
git add notes.txtcopies the path's current content into the index.git add notes.txtLater edits to the file stay unstaged until you add them too.
Κάρτα 7
Ερώτηση
Inspect which changes are staged, unstaged, or untracked.
Απάντηση
git statuscompares the working tree and index withHEAD.git statusIt reads repository state; it doesn't modify files or history.
Κάρτα 8
Ερώτηση
Record the staged snapshot with the message
Add notes.Απάντηση
git commit -m "Add notes"creates a commit from the index.git commit -m "Add notes"Unstaged changes aren't included.
Κάρτα 9
Ερώτηση
Delete the tracked file
obsolete.txtand stage that deletion.Απάντηση
git rm obsolete.txtremoves the file and stages the removal.git rm obsolete.txtCommit afterward to record the deletion in history.
Κάρτα 10
Ερώτηση
Rename tracked
old-name.txttonotes.txtand stage the change.Απάντηση
git mv old-name.txt notes.txtmoves the path and updates the index.git mv old-name.txt notes.txtGit records snapshots, so it detects the rename from the resulting content when useful.
Κάρτα 11
Ερώτηση
List local branches and show which one is current.
Απάντηση
git branchlists local branches and marks the current one with*.git branchIt doesn't switch branches.
Κάρτα 12
Ερώτηση
Switch the working tree to the existing branch
feature/login.Απάντηση
git switch feature/loginswitches to that branch.git switch feature/loginGit updates the index and working tree, and refuses if the switch would overwrite local work. Older instructions often use
git checkoutfor branch switching;switchstates the intent more clearly.Κάρτα 13
Ερώτηση
Show every configured remote with its fetch and push URL.
Απάντηση
git remote -vlists remote names and URLs.git remote -vA remote name such as
originis a local shortcut, not a special server type.Κάρτα 14
Ερώτηση
Read a compact one-line commit history.
Απάντηση
git log --onelineprints one abbreviated entry per commit.git log --onelineThe newest reachable commit appears first.
Κάρτα 15
Ερώτηση
Discard unstaged edits to tracked
notes.txt.Απάντηση
git restore notes.txtreplaces the working-tree file with the indexed version.git restore notes.txtThis is destructive for those unstaged edits. Check
git diff -- notes.txtfirst when unsure.Κάρτα 16
Ερώτηση
Clone
../origin.gitwhile naming the local directorysandbox.Απάντηση
git clone ../origin.git sandboxseparates the source location from the local directory name.git clone ../origin.git sandboxRun it from the parent directory where
sandboxshould be created.Κάρτα 17
Ερώτηση
Read the effective commit email in the current repository.
Απάντηση
git config --get user.emailprints the selected configuration value.git config --get user.emailRepository-local configuration overrides a global value.
Κάρτα 18
Ερώτηση
Get a compact status that still shows branch information.
Απάντηση
git status --short --branchprints the branch line plus two-column path states.git status --short --branchThe left column describes the index; the right column describes the working tree.
Κάρτα 19
Ερώτηση
Review what is staged for the next commit.
Απάντηση
git diff --stagedcompares the index withHEAD.git diff --staged--cachedis the common equivalent spelling.Κάρτα 20
Ερώτηση
Interactively stage selected hunks from
notes.txt.Απάντηση
git add -p notes.txtlets you accept or reject each patch hunk.git add -p notes.txtThis is useful when one file contains changes for more than one commit.
Κάρτα 21
Ερώτηση
Open the configured editor to write a commit message for the staged snapshot.
Απάντηση
git commitopens the commit-message editor.git commitGit still commits only the staged content.
Κάρτα 22
Ερώτηση
Stop tracking
local.envbut keep the file in the working tree.Απάντηση
git rm --cached local.envstages removal from the index without deleting the local file.git rm --cached local.envAdd the path to an ignore rule if it shouldn't be staged again.
Κάρτα 23
Ερώτηση
Create
feature/loginat the current commit without switching to it.Απάντηση
git branch feature/logincreates the branch reference.git branch feature/loginUse
git switch -c feature/loginwhen you want to create and switch in one step.Κάρτα 24
Ερώτηση
Add
../upstream.gitas a remote namedupstream.Απάντηση
git remote add upstream ../upstream.gitstores that remote configuration.git remote add upstream ../upstream.gitIt doesn't fetch any refs until you run
git fetch upstream.Κάρτα 25
Ερώτηση
View a compact decorated commit graph across all local refs.
Απάντηση
git log --oneline --graph --decorate --allcombines history, topology, and ref names.git log --oneline --graph --decorate --allIt is a read-only way to understand how branches relate.
Κάρτα 26
Ερώτηση
Inspect the current commit's metadata and patch.
Απάντηση
git show HEADdisplays the commit and its changes.git show HEADReplace
HEADwith another revision when needed.Κάρτα 27
Ερώτηση
Create
feature/searchat the current commit and switch to it.Απάντηση
git switch -c feature/searchcreates and checks out the branch.git switch -c feature/searchNew commits now advance
feature/search.Κάρτα 28
Ερώτηση
List the paths currently known to the index.
Απάντηση
git ls-filesprints tracked and staged paths.git ls-filesIt is more precise than a filesystem listing when you need Git's view.
Κάρτα 29
Ερώτηση
Refresh remote-tracking refs from
originwithout integrating them.Απάντηση
git fetch origindownloads objects and updatesorigin/*refs.git fetch originYour current branch and working tree stay in place.
Κάρτα 30
Ερώτηση
Unstage
notes.txtwhile keeping its working-tree edits.Απάντηση
git restore --staged notes.txtrestores the index entry fromHEADby default.git restore --staged notes.txtThe file's edited content remains in the working tree.
Κάρτα 31
Ερώτηση
Temporarily store tracked work with the label
WIP login.Απάντηση
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
Ερώτηση
Check how the current branch differs from its configured upstream.
Απάντηση
git status --branchreports ahead, behind, or diverged state when an upstream exists.git status --branchIt doesn't contact the remote, so fetch first when freshness matters.
Κάρτα 33
Ερώτηση
Compare the snapshots at
mainandfeature/login.Απάντηση
git diff main feature/loginshows changes needed to turn the first tree into the second.git diff main feature/loginThis compares the two named tips, not their merge base.
Κάρτα 34
Ερώτηση
Stage all additions, modifications, and deletions in the current repository.
Απάντηση
git add -Aupdates the index for every path in scope.git add -AReview
git diff --stagedbefore committing a broad change.Κάρτα 35
Ερώτηση
Replace the current local commit with a corrected snapshot but keep its message.
Απάντηση
git commit --amend --no-editcreates a replacement commit from the current index.git commit --amend --no-editAmending rewrites the commit ID. Avoid it after sharing the commit unless the team expects a history update.
Κάρτα 36
Ερώτηση
Rename the current branch to
feature/auth.Απάντηση
git branch -m feature/authrenames the checked-out branch.git branch -m feature/authIf the old name was already pushed, coordinate the remote rename separately.
Κάρτα 37
Ερώτηση
Return to the branch you were on immediately before this one.
Απάντηση
git switch -switches to the previously checked-out branch.git switch -It is handy for moving between two branches.
Κάρτα 38
Ερώτηση
Integrate
feature/logininto the current branch.Απάντηση
git merge feature/loginjoins the named branch into the current branch.git merge feature/loginThe result may be a fast-forward, merge commit, or conflict, depending on history and options.
Κάρτα 39
Ερώτηση
Fetch only the
mainbranch fromorigin.Απάντηση
git fetch origin maindownloads that branch and records the fetched tip inFETCH_HEAD.git fetch origin mainIt doesn't merge or move your current branch.
Κάρτα 40
Ερώτηση
Update the current branch only when the remote change can fast-forward it.
Απάντηση
git pull --ff-onlyfetches, then refuses to create a merge commit or rebase.git pull --ff-onlyA refusal leaves the divergent histories for you to inspect.
Κάρτα 41
Ερώτηση
Push the current branch
feature/logintoorigin.Απάντηση
git push origin feature/loginupdates the same-named remote branch.git push origin feature/loginIt doesn't configure an upstream unless your settings do that automatically.
Κάρτα 42
Ερώτηση
Read commits that changed
notes.txt.Απάντηση
git log -- notes.txtlimits history to commits affecting that path.git log -- notes.txtThe
--separates revisions and options from the path.Κάρτα 43
Ερώτηση
Print
notes.txtexactly as it exists inHEADwithout switching commits.Απάντηση
git show HEAD:notes.txtreads the blob at that revision and path.git show HEAD:notes.txtThis doesn't modify the working-tree file.
Κάρτα 44
Ερώτηση
Search tracked working-tree files for the text
TODO, including unstaged edits.Απάντηση
git grep TODOsearches tracked files in the working tree, including their unstaged content.git grep TODOIt skips untracked files by default.
Κάρτα 45
Ερώτηση
Show the commit and author associated with each line of
notes.txt.Απάντηση
git blame notes.txtannotates each line with its last recorded change.git blame notes.txtUse it as a history lead, not as proof that one person owns the current behavior.
Κάρτα 46
Ερώτηση
Move the current branch back one commit while keeping the changes unstaged.
Απάντηση
git reset HEAD~1performs the default mixed reset.git reset HEAD~1It rewrites the local branch tip but leaves the changed files in the working tree.
Κάρτα 47
Ερώτηση
Stash tracked and untracked work together with the label
WIP search.Απάντηση
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
--alloption.Κάρτα 48
Ερώτηση
List local tags whose names start with
v1..Απάντηση
git tag --list "v1.*"filters the local tag names.git tag --list "v1.*"Listing tags doesn't contact a remote.
Κάρτα 49
Ερώτηση
Resolve
HEADto its full object ID.Απάντηση
git rev-parse HEADprints the object name selected by the revision.git rev-parse HEADThis is useful in scripts that need an exact commit ID.
Κάρτα 50
Ερώτηση
Review prose edits as changed words instead of whole lines.
Απάντηση
git diff --word-diffhighlights inline word-level changes.git diff --word-diffIt changes the display only; repository state stays untouched.
Κάρτα 51
Ερώτηση
Integrate
feature/loginonly if the current branch can fast-forward.Απάντηση
git merge --ff-only feature/loginrefuses histories that require a merge commit.git merge --ff-only feature/loginThe refusal is a safety check, not a partial merge.
Κάρτα 52
Ερώτηση
Fetch
originand remove remote-tracking refs that the remote no longer has.Απάντηση
git fetch --prune originrefreshes refs and prunes staleorigin/*names.git fetch --prune originIt doesn't delete local branches.
Κάρτα 53
Ερώτηση
List commits reachable from
feature/loginbut not frommain.Απάντηση
git log main..feature/login --onelineshows that one-sided revision range.git log main..feature/login --onelineThe order around
..matters.Κάρτα 54
Ερώτηση
Replace working-tree
notes.txtwith its version fromHEAD~1.Απάντηση
git restore --source=HEAD~1 notes.txtcopies the older blob into the working tree.git restore --source=HEAD~1 notes.txtThis 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
Ερώτηση
Create branch
hotfixin an additional working tree at../hotfix.Απάντηση
git worktree add ../hotfix -b hotfixcreates the branch and checks it out there.git worktree add ../hotfix -b hotfixThe original working tree stays on its current branch.
Κάρτα 56
Ερώτηση
Push
feature/loginand configureorigin/feature/loginas its upstream.Απάντηση
git push -u origin feature/loginpushes the branch and records upstream tracking.git push -u origin feature/loginLater
git status,git pull, andgit pushcan use that relationship.Κάρτα 57
Ερώτηση
Follow likely moved or copied lines while blaming
notes.txt.Απάντηση
git blame -M -C notes.txtadds move and copy detection heuristics.git blame -M -C notes.txtThe result is still a clue for investigation, not an ownership verdict.
Κάρτα 58
Ερώτηση
Replay the current branch's local commits on top of
main.Απάντηση
git rebase mainrewrites those commits onto the new base.git rebase mainUse it on unshared work, or coordinate before rewriting commits other people may use.
Κάρτα 59
Ερώτηση
Move the branch back one commit while keeping all reverted changes staged.
Απάντηση
git reset --soft HEAD~1movesHEADbut leaves the index and working tree intact.git reset --soft HEAD~1This rewrites the local branch tip and is best kept to unshared history.
Κάρτα 60
Ερώτηση
Create an annotated release tag
v1.0.0at the current commit.Απάντηση
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
Ερώτηση
Start a regression search with
HEADknown bad andHEAD~4known good.Απάντηση
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~4Git checks out a midpoint for you to test.
Κάρτα 62
Ερώτηση
Fetch the upstream branch, then replay local commits on top of it.
Απάντηση
git pull --rebasecombines fetch with a rebase-based integration.git pull --rebaseIt rewrites local commits, so inspect the branch and keep shared-history expectations in mind.
Κάρτα 63
Ερώτηση
Commit the staged update as
Update noteswhile leaving unstaged edits out.Απάντηση
git commit -m "Update notes"records the index, not every working-tree edit.git commit -m "Update notes"Review both
git diff --stagedandgit diffwhen the split matters.Κάρτα 64
Ερώτηση
Undo the current non-merge commit with a new commit instead of moving the branch backward.
Απάντηση
git revert HEADapplies the inverse of the current non-merge commit and records it as a new commit.git revert HEADFor 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
Ερώτηση
Delete the fully merged local branch
feature/login.Απάντηση
git branch -d feature/logindeletes the branch only when Git considers it merged.git branch -d feature/loginThe lowercase
-dguard helps prevent accidental loss of unmerged branch tips.Κάρτα 66
Ερώτηση
Inspect
HEAD~1without moving any branch name.Απάντηση
git switch --detach HEAD~1checks out the commit in detached-HEAD mode.git switch --detach HEAD~1Create a branch before leaving if you make commits you want to keep.
Κάρτα 67
Ερώτηση
Find one best common ancestor of
mainandfeature/login.Απάντηση
git merge-base main feature/loginprints one best merge base.git merge-base main feature/loginCriss-cross histories can have multiple equally best bases. Use
git merge-base --all main feature/loginwhen every best base matters; without--all, Git chooses one unspecified best base.Κάρτα 68
Ερώτηση
Print the top-level directory of the current working tree.
Απάντηση
git rev-parse --show-toplevelresolves the repository root path.git rev-parse --show-toplevelIt fails outside a working tree, which is useful in scripts that require one.
Κάρτα 69
Ερώτηση
Inspect recent local movements of
HEAD.Απάντηση
git reflog --onelineshows the local reference-update history in compact form.git reflog --onelineIt can reveal commits hidden by reset or rebase while their objects still exist.
Κάρτα 70
Ερώτηση
List stashes, then summarize the newest stash's changed paths.
Απάντηση
git stash listnames the entries, andgit 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
Ερώτηση
Apply the tip commit from
feature/loginwithout conflicts and record where it came from.Απάντηση
git cherry-pick -x feature/loginapplies the commit and, when it applies without conflicts, adds a source-commit line to the message.git cherry-pick -x feature/loginUse
-xwhen the trace is useful and the picked commit is public enough to name.Κάρτα 72
Ερώτηση
Preview which untracked files under
scratch/Git would delete.Απάντηση
git clean -nd -- scratch/performs a scoped dry run.git clean -nd -- scratch/Run the preview before replacing
-nwith-f; ignored files aren't included here.Κάρτα 73
Ερώτηση
Identify conflicted paths after a merge stops.
Απάντηση
git status --shortmarks unmerged paths with combinations such asUU.git status --shortResolve each path, stage the result, then complete the merge commit—or abort the merge.
Κάρτα 74
Ερώτηση
Continue a rebase after resolving and staging its conflicts.
Απάντηση
git rebase --continuerecords the resolved step and moves to the next commit.git rebase --continueIf the resolution is wrong or the rewrite is no longer wanted, abort instead.
Κάρτα 75
Ερώτηση
List every working tree attached to the repository.
Απάντηση
git worktree listshows each path, checked-out commit, and branch when attached.git worktree listA branch normally can't be checked out in two worktrees at once.
Κάρτα 76
Ερώτηση
Fetch and integrate the upstream with merge semantics rather than rebase.
Απάντηση
git pull --no-rebasefetches, then merges the selected upstream.git pull --no-rebaseUse an explicit policy so the integration behavior isn't a surprise.
Κάρτα 77
Ερώτηση
Interactively discard selected unstaged hunks from
notes.txt.Απάντηση
git restore -p notes.txtasks which working-tree hunks to restore from the index.git restore -p notes.txtAccepted hunks are discarded, so review each prompt carefully.
Κάρτα 78
Ερώτηση
Delete the remote branch
feature/loginfromorigin.Απάντηση
git push origin --delete feature/loginremoves that remote ref.git push origin --delete feature/loginIt doesn't delete anyone's local branch or existing commits immediately.
Κάρτα 79
Ερώτηση
Mark
HEAD~4as a known good boundary during a bisect session.Απάντηση
git bisect good HEAD~4tells Git that the named commit doesn't contain the bug.git bisect good HEAD~4Git uses good and bad boundaries to choose the next midpoint.
Κάρτα 80
Ερώτηση
Delete the local tag
v1.0.0.Απάντηση
git tag -d v1.0.0removes the local tag reference.git tag -d v1.0.0A remote copy, if any, needs a separate remote update.
Κάρτα 81
Ερώτηση
Move the branch back one commit and discard the index and working-tree changes.
Απάντηση
git reset --hard HEAD~1makes the branch, index, and tracked working tree matchHEAD~1.git reset --hard HEAD~1This 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
Ερώτηση
Give the current commit a human-readable name based on reachable tags.
Απάντηση
git describe --tags --alwaysuses the nearest tag when possible and falls back to an object name.git describe --tags --alwaysIt reads history without creating or moving a tag.
Κάρτα 83
Ερώτηση
Continue a cherry-pick after resolving and staging its conflicts.
Απάντηση
git cherry-pick --continuefinishes the current picked commit.git cherry-pick --continueGit may continue to another commit if the original request included a sequence.
Κάρτα 84
Ερώτηση
Delete ordinary, non-ignored untracked files and directories only under
scratch/.Απάντηση
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
Ερώτηση
Apply the inverse of the current non-merge commit to the index and working tree without committing yet.
Απάντηση
git revert --no-commit HEADprepares the inverse of the current non-merge commit for inspection.git revert --no-commit HEADFor 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
Ερώτηση
Apply the newest stash while keeping it in the stash list.
Απάντηση
git stash apply stash@{0}reapplies the entry without dropping it.git stash apply stash@{0}Use
poponly when you want a successful apply to remove the entry automatically.Κάρτα 87
Ερώτηση
Create branch
recoveredat the previous recorded location ofHEAD.Απάντηση
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
Ερώτηση
Abandon the current conflicted merge and return to its pre-merge state.
Απάντηση
git merge --abortstops the in-progress merge.git merge --abortUncommitted changes that predated the merge can make exact reconstruction harder, so start risky merges from a clear state.
Κάρτα 89
Ερώτηση
Unstage
notes.txtwith the older path-specific reset form.Απάντηση
git reset HEAD -- notes.txtresets only the index entry and keeps working-tree edits.git reset HEAD -- notes.txtModern instructions usually prefer
git restore --staged notes.txtfor this job.Κάρτα 90
Ερώτηση
Remove the clean linked working tree at
../hotfix.Απάντηση
git worktree remove ../hotfixremoves that working tree and its administrative record.git worktree remove ../hotfixIt refuses a dirty working tree unless you force it; inspect and save work instead of forcing by habit.
Κάρτα 91
Ερώτηση
Force-update
feature/loginonly if its remote tip matches your localorigin/feature/loginexpectation.Απάντηση
git push --force-with-lease origin feature/logincompares the remote branch with the local remote-tracking ref before force-updating.git push --force-with-lease origin feature/loginBackground 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
Ερώτηση
Abandon the current rebase and restore the branch to its pre-rebase state.
Απάντηση
git rebase --abortstops the rewrite and restores the original branch tip.git rebase --abortUse it when the conflict resolution or rewrite plan isn't worth continuing.
Κάρτα 93
Ερώτηση
Revert the current merge commit while keeping its first parent as the mainline.
Απάντηση
git revert -m 1 HEADcreates an inverse change relative to parent 1.git revert -m 1 HEADChoosing 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
Ερώτηση
End a bisect session and return to the branch or commit checked out before it.
Απάντηση
git bisect resetrestores the pre-bisect checkout.git bisect resetRun it after identifying the first bad commit or when abandoning the search.
Κάρτα 95
Ερώτηση
Read the reflog specifically for
HEAD.Απάντηση
git reflog show HEADdisplays local movements recorded forHEAD.git reflog show HEADReflogs are local recovery records; they aren't a shared remote audit log.
Κάρτα 96
Ερώτηση
Abandon the current conflicted cherry-pick.
Απάντηση
git cherry-pick --abortrestores the state from before the cherry-pick sequence.git cherry-pick --abortUse it instead of stacking unrelated cleanup commands onto a failed pick.
Κάρτα 97
Ερώτηση
Interactively edit the last three local commits before sharing them.
Απάντηση
git rebase -i HEAD~3opens a plan for reordering, editing, squashing, or dropping those commits.git rebase -i HEAD~3Every changed commit gets a new ID. Keep interactive rebase to unshared work unless everyone has coordinated.
Κάρτα 98
Ερώτηση
Run
./test.shautomatically at each midpoint of an active bisect.Απάντηση
git bisect run ./test.shclassifies commits from the script's exit status.git bisect run ./test.shThe test must be deterministic: exit 0 for good, 1–127 except 125 for bad, and 125 to skip an untestable commit.
98 κάρτες
Git Commands Flashcards: Everyday Workflow, Branching & Recovery
Το Nibomo ανοίγει για να ξεκινήσετε τη μελέτη.