Practice quiz: branching and merging
Ace your homework & exams now with Quizwiz!
How do we display a summarized view of the commit history for a repo, showing one line per commit?
git log --graph --oneline The commandgit log --graph --oneline shows a summarized view of the commit history for a repo.
What command would we use to throw away a merge, and start over?
git merge --abort If there are merge conflicts, the --abort flag can be used to abort the merge action.
When we merge two branches, one of two algorithms is used. If the branches have diverged, which algorithm is used?
three-way merge A three-way-merge occurs when the two commits have diverged previously, and a new commit is created.
