Last active
January 20, 2021 17:26
-
-
Save ubermachine/ed9f773e715cc9d048bfc79bfd87c595 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git config --global color.ui auto | |
Advanced Git Cheat Sheet | |
git commit -a Stages files automatically | |
git log -p Produces patch text | |
git show Shows various objects | |
git diff Is similar to the Linux `diff` command, and can show the differences in various commits | |
git diff --staged An alias to --cached, this will show all staged files compared to the named commit | |
git add -p Allows a user to interactively review patches to add to the current commit | |
git mv Similar to the Linux `mv` command, this moves a file | |
git rm Similar to the Linux `rm` command, this deletes, or removes a file | |
git checkout is effectively used to switch branches. | |
git reset basically resets the repo, throwing away some changes. It’s somewhat difficult to understand, so reading the examples in the documentation may be a bit more useful. | |
There are some other useful articles online, which discuss more aggressive approaches to resetting the repo. | |
git commit --amend is used to make changes to commits after-the-fact, which can be useful for making notes about a given commit. | |
git revert makes a new commit which effectively rolls back a previous commit. It’s a bit like an undo command. | |
There are a few ways you can rollback commits in Git. | |
There are some interesting considerations about how git object data is stored, such as the usage of sha-1. | |
Merge & Branch | |
git branch Used to manage branches | |
git branch <name> Creates the branch | |
git branch -d <name> Deletes the branch | |
git branch -D <name> Forcibly deletes the branch | |
git checkout <branch> Switches to a branch. | |
git checkout -b <branch> Creates a new branch and switches to it. | |
git merge <branch> Merge joins branches together. | |
git merge --abort If there are merge conflicts (meaning files are incompatible), --abort can be used to abort the merge action. | |
git log --graph --oneline This shows a summarized view of the commit history for a repo. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment