Terms

1. Repository (remote & local):
2. Branch (remote & local)
3. checkout, diff, tags and commit
4. clone, push and pull
5. merge, rebase, apply patch

Workflow

example

0. [incase of doubt use git status]
1. git clone [email protected]:amitmh/hello-git.git
2. [a] checkout -b branch-name
3. [b] do your changes; say in README.md
4. [a] git status should give you modified file name
5. [b] git diff README.md this will give you changes with respect to master.
6. [c] git add README.md
7. $git commit -am 'add this comment'
8. $git push --set-upstream origin branch-name this will upload changes to remote
9. [a] to merge changes in master raise pull request or
10. [b][1] git checkout master
11. [b][2] git merge feature
12. [b][3] git push