Version Control Flashcards

What does `git remote -v` display?

Answer: The names and URLs of all configured remote repositories

`git remote -v` lists each configured remote alias alongside its fetch and push URLs.

Which branching strategy uses long-lived branches like `main`, `develop`, `release`, and `hotfix`?

Answer: Gitflow

Gitflow defines a strict branching model with specific branch roles for features, releases, and hotfixes around `main` and `develop`.

What is the outcome of running `git pull --rebase`?

Answer: Fetches remote changes and rebases your local commits on top of them instead of creating a merge commit

`git pull --rebase` fetches remote commits then replays your local commits on top, producing a linear history.

What does the `HEAD~3` syntax refer to in Git?

Answer: The commit three steps before the current HEAD

`HEAD~3` is a relative reference pointing to the great-grandparent commit of the current HEAD.

What is the role of a Git 'hook'?

Answer: Scripts that run automatically at specific points in the Git workflow, like before a commit

Git hooks are scripts in the `.git/hooks/` directory that execute automatically on events like `pre-commit`, `post-merge`, or `pre-push`.

In a conflict marker, what does the section between `<<<<<<< HEAD` and `=======` represent?

Answer: The changes from your current branch

The section under `<<<<<<< HEAD` and before `=======` shows your local branch's version of the conflicting lines.

What does `git submodule` allow you to do?

Answer: Include another Git repository as a subdirectory within your repository

Git submodules let you embed one repository inside another, tracking a specific commit of the embedded repo.