1. WORKING WITH GIT
Praveen Chamarthi / @praveenc

2. INSTALLING GIT
http://git-scm.com/downloads

3. GLOBAL CONFIGURATION
Mandatory
$ git config ­­global user.username "praveenc"
$ git config ­­global user.name "Praveen C"
$ git config ­­global user.email "praveenc@netmail.com"
Optional, but good to have
$ git config ­­global core.editor "vim"
$ git config ­­global core.autocrlf "false"
$ git config ­­global color.ui "auto"
$ git config ­­global color.diff "auto"
$ git config ­­global color.branch "auto"
$ git config ­­global color.interactive "auto"

4. GIT ALIASES
Most common
$ git config ­­global alias.co checkout
$ git config ­­global alias.br branch
$ git config ­­global alias.ci commit
$ git config ­­global alias.st status
$ git config ­­global alias.unstage 'reset HEAD ­­'
$ git config ­­global alias.last 'log ­1 HEAD'
E.g.
$ git co development
Switched to branch 'development'
External commands
$ git config ­­global alias.visual "!gitk"

5. CLONING REPOSITORIES
git clone [url]:reponame
E.g.
$ git clone git@mygitserver.com:platform.git
Cloning into 'platform'...
remote: Counting objects: ..., done.
remote: Compressing objects: ..., done.
remote: Total ..., reused ... (delta ...)
Receiving objects: 100% (...), 42.25 MiB | 15.57 MiB/s, done
Resolving deltas: 100% (...), done.
Checking connectivity... done.
Checking out files: 100% (...), done.

6. VERIFYING REMOTES (SOURCE)
View remote props
$ git remote ­v
origin git@mygitserver.com:platform (fetch)
origin git@mygitserver.com:platform (push)
$ git remote show origin
* remote origin
Fetch URL: git@mygitserver.com:platform
Push URL: git@mygitserver.com:platform
HEAD branch: master
Remote branches:
development tracked
master tracked
Local branch configured for 'git pull':
master merges with remote master
Local ref configured for 'git push':
master pushes to master (up to date)

7. CHECKOUT REMOTE BRANCH
View remote branches
$ git branch ­r
origin/HEAD ­> origin/master
origin/development
origin/master
Check-out remote branch 'development'
$ git branch
* master
$ git checkout development
Switched to a new branch 'development'
$ git branch
* development
master
$ git status
on branch development
nothing to commit, working directory clean

8. GIT COMMIT WORKFLOW

9. ADD FILES TO STAGING AREA
Adding files
$ git add .
$ git add ­A
$ git add ­­all
$ git add js/*.js
$ git add *.txt
Diff
$ git diff
$ git diff ­­staged

10. COMMITTING CHANGES
Committing a staged change
$ git commit ­m "Added readme.txt"
Add to staging and commit
$ git commit ­a ­m "Added readme.txt"

11. MANAGING CHANGES
Unstaging changes
$ git reset HEAD [filename]
Unmodifying a modified file
$ git checkout ­­ [filename]
** WARNING: You'll lose all changes (un-recoverable) **
Amending commits
$ git commit ­m "NM­0000 fixed something"
$ git add forgotten_file
$ git commit ­­amend

12. VIEW COMMIT HISTORY
default log view
$ git log
commit ca82a6dff817ec66f44342007202690a93763949
Author: Praveen Chamarthi [praveenc@netmail.com]
Date: Tue Mar 12 21:52:11 2015 ­0700
changed the version number
detailed log
$ git log ­p ­1
commit a4ef8f2c37c0408b7c69f66f95c796ea64e4bbaf
Author: debug [debug@netmail.com]
Date: Wed May 13 13:36:11 2015 ­0400
added readme.txt
diff ­­git a/readme.txt b/readme.txt
new file mode 100644
index 0000000..709087a
­­­ /dev/null
+++ b/readme.txt
@@ ­0,0 +1 @@
+thiasdfkajsdfadfl;asdfa

13. SYNC CHANGES WITH SERVER
Push & Pull
$ git push (push to remote repo)
$ git fetch (fetch only, no merge)
$ git pull (git fetch + git merge)
git pull = git fetch + git merge

14. GIT BRANCHING
Checkout a remote branch
View remote branches
$ git branch ­r
origin/HEAD ­> origin/master
origin/development
origin/master
Checkout remote branch
$ git checkout [branchname]
E.g.
$ git checkout development

15. GIT BRANCHING
Working with local branches
$ git checkout development
$ git branch
* development
master
create local branch using -b flag
$ git checkout ­b NM­3435
Switched to a new branch 'NM­3435'
$ git branch
* NM­3435
development
master

16. GIT BRANCHING
Merging local branch to upstream branch
$ git checkout development
Switched to branch 'development'
$ git pull
Updating development
Fast­forward
$ git merge NM­3435
Updating 9e11133..a4ef8f2
Fast­forward
readme.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 readme.txt
Deleting a local branch
$ git branch ­d NM­3435
Deleted branch NM­3435 (was a4ef8f2).

17. GIT TAGS
List tags
$ git tag ­l
5.4.0.550
5.4.0.541
$ git tag ­l '5.4.0*'
Create Tags
$ git tag 5.4.0_HP2 (lightweight tag)
$ git tag ­a 5.4.0_HP2 ­m "5.4.0 HP2 ­ performance improvements"
Sharing Tags
$ git push ­­tags (push all tags)
$ git push origin 5.4.0_HP2 (push specific tags)

18. GIT TAGS
Checking out a Tag
$ git checkout tags/5.4.0_HP2
$ git branch ­a
* (detached from 5.4.0_HP2)
master
remotes/origin/HEAD ­> origin/master
remotes/origin/develop
remotes/origin/master
$ git checkout ­b HP2_Fix
Switched to new branch 'HP2_Fix'

19. Q & A
praveenc@netmail.com