Skip to content

Instantly share code, notes, and snippets.

@spaceplesiosaur

spaceplesiosaur/git_questions.md

Created February 6, 2020 18:53
Show Gist options
  • Save spaceplesiosaur/98b7115ea418df160ae765e7961a481d to your computer and use it in GitHub Desktop.
Save spaceplesiosaur/98b7115ea418df160ae765e7961a481d to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git_questions.md

What is one command that you'll incorporate into your daily workflow and why?

I make a lot of articulations on branches as I'm going, so I might start stashing those instead of making new random branches with then on it.

How does rebasing work compared to a merge workflow?

From my understanding, a rebase takes commits from a branch 1 by 1 and then attaches them to a different commit in chronological order, but giving them new identifiers and timestamps. I believe a merge sort of mushes all of the commits together, going by timestamp.

Why would we ever use git stash?

I think I will use it for articulations and pratice branches - code/comments that I want to do that depends on code in a project, but not code that I want to merge.

What is the primary difference between git reset —soft and git reset —hard?

I didn't get that far, but it sounds like soft keeps your changes and hard wipes your changes. Soft will only reset your commit history,

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment