When pushing to a remote server, what is the only type of merge that is accepted by default?

Which command will show what revision and author last modified each line of a file?

Using which command you can apply a certain commit to the current branch, using the commit's SHA1?

What is the default text editor used by git?

What is the "git status" option used to output the shortened project status?

`git rebase <upstream>` will:

What Git workflow is used by teams that collaborate on a single branch and avoid creating long-lived development branches?

What is the main issue with using git rebase when working with multiple developers?

Which command correctly creates a lightweight tag?

If you have several commits for a single feature, what is the most efficient way to restructure your commit history?

After starting to merge a feature branch into your master branch, you encounter a merge conflict and decide you do not want to perform the merge. How can you stop the merge and restore to the pre-merge state?