Version Control System (VCS) is a software that helps software developers to work together and maintain a complete history of their work.
-Centralized version control system (CVCS).
-Distributed/Decentralized version control system (DVCS).
-git init
git add file1.js - Stages a single file
git add file1.js file2.js - Stages multiple files
git add *.js - Stages with a pattern
git add . - Stages the current directory and all its content
git status - Full status
git status -s - Short status
git commit -m “Message” - Commits with a one-line message
git commit - Opens the default editor to type a long message
git rm file1.js - Removes from working directory and staging area
git rm --cached file1.js - Removes from staging area only
git mv file1.js file1.txt
git diff - Shows unstaged changes
git diff --staged - Shows staged changes
git diff --cached - Same as the above
git log - Full history
git log --oneline - Summary
git log --reverse - Lists the commits from the oldest to the newest
git show HEAD - Shows the last commit
git show HEAD~2 - Two steps before the last commit
git show HEAD:file.js - Shows the version of file.js stored in the last commit
git restore --staged file.js - Copies the last version of file.js from repo to index
git log --oneline
git log -3 - Shows the last 3 entries
git log hash1..hash2 - Range of commits
git log file.txt - Shows the commits that touched file.txt
git log --stat file.txt - Shows statistics (the number of changes) for file.txt
git log --patch file.txt - Shows the patches (changes) applied to file.txt
git diff HEAD2 HEAD - Shows the changes between two commits2 HEAD file.txt - Changes to file.txt only
git diff HEAD
git shortlog
git branch bugfix - Creates a new branch called bugfix
git checkout bugfix - Switches to the bugfix branch
git switch bugfix - Same as the above
git switch -C bugfix - Creates and switches
git branch -d bugfix - Deletes the bugfix branch
git log master..bugfix- Lists the commits in the bugfix branch not in master
git diff master..bugfix - Shows the summary of changes
git stash push -m “New tax rules”- Creates a new stash
git stash list - Lists all the stashes
git stash show stash@{1} - Shows the given stash
git stash show 1 - shortcut for stash@{1}
git stash apply 1- Applies the given stash to the working \dir
git stash drop 1 - Deletes the given stash
git stash clear - Deletes all the stashes
git merge bugfix - Merges the bugfix branch into the current branch
git merge --no-ff bugfix - Creates a merge commit even if FF is possible
git merge --squash bugfix - Performs a squash merge
git merge --abort - Aborts the merge
git branch --merged - Shows the merged branches
git branch --no-merged - Shows the unmerged branches
git rebase master -Changes the base of the current branch
git rebase -i HEAD~5
git cherry-pick dad47ed - Applies the given commit on the current branch
git fetch origin master - Fetches master from origin
git fetch origin - Fetches all objects from origin
git fetch - Shortcut for “git fetch origin”
git pull - Fetch + merge
git push origin master - Pushes master to origin
git push - Shortcut for “git push origin master”
git branch -r - Shows remote tracking branches
git branch -vv - Shows local & remote tracking branches
git push -u origin bugfix - Pushes bugfix to origin
git push -d origin bugfix - Removes bugfix from origin
git reset --soft HEAD^ - Removes the last commit, keeps changed staged
git reset --mixed HEAD^ - Unstages the changes as well
git reset --hard HEAD^ - Discards local changes
git revert 72856ea - Reverts the given commit
git revert HEAD3.. - Reverts the last three commits3..
git revert --no-commit HEAD
git reflog - Shows the history of HEAD
git reflog show bugfix -- Shows the history of bugfix pointer
git commit --amend