Version Control Flashcards

What does `git rebase` do compared to `git merge`?

Answer: Rebase rewrites commit history by replaying commits onto a new base

Git rebase replays commits from one branch onto another, creating a linear history without a merge commit.

Which command shows the commit history as a graph in the terminal?

Answer: git log --graph --oneline

`git log --graph --oneline` displays an ASCII graph of the branch and merge history alongside condensed commit info.

What is a 'detached HEAD' state in Git?

Answer: HEAD points directly to a commit instead of a branch

A detached HEAD occurs when HEAD points to a specific commit SHA rather than a branch name.

What does `git cherry-pick ` do?

Answer: Applies the changes from a specific commit onto the current branch

Cherry-pick applies the diff introduced by a specific commit onto the currently checked-out branch.

In Git, what is the purpose of `.gitignore`?

Answer: Specifies intentionally untracked files that Git should ignore

`.gitignore` lists patterns of files and directories that Git should not track or include in commits.

What happens when you run `git fetch` without `git merge`?

Answer: Remote changes are downloaded but your working directory is not updated

`git fetch` retrieves remote changes into your local repository's remote-tracking branches without altering your working files.

Which Git command is used to temporarily save uncommitted changes without committing them?

Answer: git stash

`git stash` shelves your working directory changes so you can switch contexts and reapply them later.