Blog

How to List Branches in GIT
- 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 to current branch
```
git branch --merged
```
- List all branches NOT merged to current branch
```
git branch --no-merged
```
February 27, 2017
How to Delete Branch in GIT
- 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 --delete --force <branch-name-to-delete>
```
February 27, 2017
How to Create Branch in GIT
- 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>
```
February 27, 2017
How to Merge in GIT
- 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>
```
```
E.g.
```
```
git checkout master
```
- See if it has now ahead/behind revisions differences status
```
git branch -vv
```
- Resolve behind revisions
  - Fetch all to update remote-branch in local cache
```
   git fetch --all 
```
```
   git merge <remote-branch>
```
```
   E.g.
```
```
   git merge origin/master
```
- ~~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
```
February 27, 2017
How to Commit in GIT
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 re-add, re-commit)
```
```
git reset HEAD~
```
```
Undo git commit (changes remain staged i.e. after modification, we need to re-commit only) -- useful when we need to change only commit message
```
```
git reset --soft HEAD~
```
```
Above commands are like moving commit pointer to 1 back position. In case, we want to undo multiple commits, we can use like below
```
```
git reset HEAD~3 -> * Undoes 3 commits (changes get unstaged)
```
```
git reset --soft HEAD~3 -> * Undoes 3 commits (changes remain staged) 
```
February 27, 2017
What is Stash in GIT
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>
February 27, 2017
How to do Undo things done mistakenly in GIT
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 (Not pushed yet)

With git log check which commit is one prior the merge. Then you can reset it using:
```
1. git log --oneline -n 2
```
```
2. git reset --hard <commit_sha_previous_to_merged_one>
```
```
OR
```
```
git reset --hard HEAD~1
```
February 27, 2017
How to Moving files in GIT
```
git mv <file1> <file2>
```
February 27, 2017
How to rename files from GIT
```
git mv <file1> <file2>
```
February 27, 2017
How to know the status of files Addition and Deletion in GIT
Status
```
git status -s
```
February 27, 2017