Cheat Sheet - Git

While working with Git, generally there three sources, Git Official Docs, Bitbucket Docs  or Google. Even though we refer these resources, it consumes lot of time to get what we want i.e. right syntax and example.

To avoid doing this every time I have enlisted few of them as cheat sheet which can be used whenever required.

1. Initialize git repo
   

   $ git init

2. Set User Name and Email Id
   

   $ git config --global user.name "<user_name>"
   $ git config --global user.email "<user_email_id>"

3. List Global Settings
   

   $ git config --global --list

4. Push all changed files
   

   $ git add .
   $ git commit –m "<commit_message>"
   $ git push origin <remote_branch_name>

5. Push a specific commit
   

   $ git push origin <commit_SHA_id>:master

6. Stash the changes.
   

   $ git stash save "<stash_message>"

7. Get list of stash.
   

   $ git stash list

8. Pop last stash
   

   $ git stash pop

9. Pop a particular stash. ( Recommended )
                 Use list command (previous command) to know the stash Id which you want to retrieve. Following command will retrieve stash with ID "stash@{1}". Generally it follows stack index. Ex. last stash index will be 0, second last stash index will be 1 and so on.
   

   $ git stash apply "stash@{1}”

10. List all branches
    

    $ git branch –a

11. Navigate between the branches.
    

    $ git checkout <branch_name>

12. Merge a branch into active(current) branch
    

    $ git merge <branch_to_be_merged_in_current_branch>

13. Undo local commit and keep local changes.
    

    $ git reset --soft HEAD~1       (Reset last commit) 
    $ git reset --soft HEAD~2       (Reset last 2 commits)

14. Undo local commit and don't keep local changes.
    

    $ git reset --hard HEAD~1       (Reset last commit) 
    $ git reset --hard HEAD~2       (Reset last 2 commits)

15. Reset to remote branch ‘develop’ & keep your changes.
    

    $ git reset origin/develop

16. Cleanup local branch references ( prune )
    

    $ git fetch --prune

17. Merge remote develop branch into local feature branch. When you are on feature branch, run following command:
    

    $ git pull origin develop

    Here source branch is origin (In this case origin refers to local feature branch) and
    destination branch is develop (In this case develop refers to remote develop branch)
18. Reset to remote branch ‘develop’ & keep your changes.
    

    $ git reset origin/develop

19. Get commit id of commit which was pushed 1 year back.
    

    $ git log --pretty=format:"%h" --until="1 year ago" -1

20. Winter is coming...