AkshatBajaj/Git Cheatsheet.md

## Git Cheatsheet.md

      
    Raw
  

              Git Cheatsheet.md
            
          
    Git Cheatsheet

vim cheatsheet


https://vim.rtorr.com/

What is HEAD?


HEAD is a reference to the last commit in the currently checked-out branch.
For more info: https://stackoverflow.com/questions/2529971/what-is-the-head-in-git

Viewing unpushed Git commits


git log origin/master..HEAD
git diff origin/master..HEAD

Remove ignored directories and files


git clean -fdX

Set the remote


git remote add remote-name repository-URL
git remote -v (to verify)

Sync the fork


git fetch upstream
git checkout master (for master)
git merge upstream/master (for master)
git push origin master (for master)

Sync the branches


git checkout branchname (merge to)
git merge branchname (merge from)

Sync local branch with remote branch


git fetch origin
git reset --hard origin/branch-name
git clean -f -d

Which remote branch, local branch is tracking?


For current branch: git checkout

View the status of changed files


git status

Stash


git stash push -m "message"
Apply: git stash apply stash@{index}. For example: git stash apply stash@{1}

Pushing to remote


git add .
git commit -m "Commit Message"
git push origin BranchName

Remove the staged changes (Added by git add)


git reset filename
git reset (for all the files)

How to revert a commit pushed to a repo


git reset --hard HEAD~ (hard or soft or mixed depending on the requirements)(For Latest commit) OR
git reset --hard <last_working_commit_id> (for a specific commit)
git push origin -f (To force push it to the remote)

Listing merged branches


git branch --merged

Delete a branch


git branch -d  (local branch)
git push origin --delete  (remote branch)

Remove branches from git branch -r


git fetch --prune
git remote prune upstream (for a specific remote)

Undo modifications


git checkout -- . (to checkout all the files)
git checkout -- index.html (for a specific file)
Fetch file from different branch: git checkout master -- a.py

Commit only part of a file in Git


git add --patch "file name"
Stage this hunk [y,n,q,a,d,/,j,J,g,s,e,?]?
https://stackoverflow.com/questions/1085162/commit-only-part-of-a-file-in-git

Abort git rebase -i (with error)


:cq

Continue git merge after resolving conflicts


git merge --continue or git commit

Make an existing Git branch track a remote branch


git push -u origin branch-name
The equivalent long option is --set-upstream

To fetch the pull request


git fetch upstream pull/pr-number/head:pr-pr-number
git checkout pr-pr-number

How to rebase against another branch overriding conflicts


https://demisx.github.io/git/rebase/2015/07/02/git-rebase-keep-my-branch-changes.html
git rebase -Xtheirs master (rebase preferring current branch)
git rebase -Xours master (rebase preferring master)

Recover from force push


git reset --hard origin/branch-name@{1}
git push -f origin branch-name
For more info: https://stackoverflow.com/questions/12568628/how-to-recover-from-a-git-push-force

Change commit message


https://help.github.com/en/articles/changing-a-commit-message

Resetting git config


git config --global --unset X, where X is the name of the setting (remove global flag for repo level)
For instance: git config --global --unset http.postBuffer
For more info: https://stackoverflow.com/questions/50530583/resetting-git-config

** Akshat Bajaj, 2018**