Day: February 27, 2017

COMPARE BRANCH Compare two branches (local) and show how much commits each branch is ahead of the other git rev-list –left-right –count <branch1>…<branch2> DIFF STATUS Get differences status between local (checked-out) branch and its respective remote (tracked) branch git checkout <local-branch> git status -sb Example Output: ## <local-branch>…<remote-branch> [ahead 2, behind 1] DIFF AHEAD revisions…

List all remote branches # Show only remote branches names git remote # Show remote branches names with links git remote -v Update everything on local from remote git remote update * This command will update the local repository with ALL the content at ALL those remotes at git server. It would not show any…

Rename currently checked-out local branch git branch -m <new-branch-name> Rename local branch git branch -m <branch_name_to_rename> <new-branch-name> push new branch name to remote git push origin :<old_name> <new_name> Rename branch locally and remotely in 3 steps # Rename branch locally git branch -m <old-branch-name> <new-branch-name> # Delete the old branch git push origin :<old-branch-name> #…

List all local branches with names only git branch List all remote branches with names only git branch -r List all local and remote branches with names only git branch -a List last commit on each branch git branch -v List last commit + remote-name on each branch git branch -vv List all branches merged…

Switch to some other branch first git checkout <some-other-branch-name> Delete remote branch git push origin –delete <branch_name> Delete local branch now (This command will fail, if there is any pending work to be committed / merged) git branch -d <branch-name-to-delete> Delete local branch forcefully irrespective of merge status git branch -D <branch-name-to-delete> OR git branch…

Create a blank branch (no-switching) git branch <branch-name> Create a blank branch and switch to it git checkout -b <branch-name> Create a branch from other branch git checkout -b <branch-name> <branch-name-from>

register modified and untracked files git add <files-to-add> Commit changes git commit -m “commit message” pull changes from origin git pull –rebase In case, merge conflict appears git mergetool –tool=opendiff Once merge is complete, save file and complete rebasing git rebase –continue Push finally git push resolve behind revisions Checkout to local-branch git checkout <local-branch>…

Commit code (make sure to add files first which need to be committed) git commit -m <message> Commit code to previous commit git commit –amend E.g. git commit -m ‘sample commit’ git add forgotten-file git commit –amend Undo Add git reset Undo Commit Undo git commit (changes get unstaged i.e. after modification, we need to…

Clear stash list git stash clear Show all stashes git stash list Drop a stash Removes latest stash git stash drop Removes given stash name git stash drop <name-of-stash-to-drop>

Remove file added to staging for commit Undo git add command git checkout — <filename> Discard Changes to added file to staging git checkout <filename>; i.e. checkout repository’s version Undo last commit git reset –soft HEAD^ *This command would undo commit, but would keep changes so that we can re-modify and re-commit Undoing GIT Merge…