-
- git commit -m 'what you did for this commit'
-
- git branch newBranch - creates a new branch
- git checkout -b newBranchName - makes a new branch and moves you to it
- git switch branchName(or git checkout branchName) -moves you to a different branch
-
- git merge branchName will merge the branchName with the branch you are currently on.
-
- git rebase branchToMoveTo - This command will move the commits of the branch you are currently on, to the branch you name. To fully combine you need to then move (checkout) to the branchToMoveTo and git rebase branchYouAreCurrentlyOn.
-
HEAD is the commit you are working on top of
-
git checkout commitName will move HEAD from a branch to a commit
-
Moving upwards one commit at a time with ^
-
Moving upwards a number of times with ~
-
git checkout main^ will move HEAD one generation up. ^^ will move it two, etc
-
git checkout HEAD~4 will move HEAD up four spaces
-
git branch -f main HEAD~3 moves (by force) the main branch to three parents behind HEAD.
-
git reset reverses changes by moving a branch reference backwards in time to an older commit. LOCAL ONLY
-
git reset HEAD~1 moves reference back by 1 from Head
-
git revert branchName works for remote branches
-
git cherry-pick commitName commitName adds commits from other branches onto your current branch
-
Discusses an interactive way to rebase using a command such as: git rebase -i HEAD~4
-
This would be a good way to go through and remove and change the order of commits if you have one that has changes you do not want.
-
Grabbing just one commit
-
discusses using both rebase and cherry pick to select which commit to keep and move
-
How to alter a commit way up the chain:
-
git commit -i HEAD~2 re-order the commits so the one we want to change is on top with git rebase -i
-
git commit --amend to make the slight modification
-
git rebase -i HEAD~2 re-order the commits back to how they were previously with git rebase -i
-
git rebase caption main move main to this updated part of the tree to finish the level
-
How to accomplish the same as above using cherry pick and no rebase:
-
git checkout branchYouWantToBeOn
-
git cherry-pick commitYouWantToAmend pick the commit you want to amend.
-
git commit --amend Amend the commit.
-
git cherry-pick commitYouWantAtTheEndOfTheBranch
-
Tags exist as anchors in the commit tree that designate certain spots.
-
*git tag v1 C1
-
git describe Describes where you are relative to the closest "anchor" (aka tag).
-
Git describe takes the form of: git describe
-
is anything git can resolve into a commit. If you don't specify a ref, git just uses where you're checked out right now (HEAD).
-
The output of the command looks like: __g :Tag is the closest ancestor tag in history, numCommits is how many commits away that tag is, and is the hash of the commit being described.
- demonstrates how you can move branches and merge them so commits are in order
- Like the ~ modifier, the ^ modifier also accepts an optional number after it.
- Rather than specifying the number of generations to go back (what ~ takes), the modifier on ^ specifies which parent reference to follow from a merge commit. Remember that merge commits have multiple parents, so the path to choose is ambiguous.
- Git will normally follow the "first" parent upwards from a merge commit, but specifying a number with ^ changes this default behavior.
