Git intro hands on windows with msysgit

GIT Intro and usage on
Windows - Basic
By Geshan Manandhar
http://geshan.blogspot.com
1http://geshan.blogspot.com

Agenda
 What is git
 Who uses it, features
 How to use git on windows
 Prepare working directory
 Create public repository
 Add, commit, pull, push
 Git ignore
 Other commands and things to look at
http://geshan.blogspot.com 2

GIT is
 a free & open source, distributed
version control system.
 designed to handle everything from small
to very large projects with speed and
efficiency.
 a developer’s friend in a multi
developer environment.
 a must tool to go back in history to what
you coded and see the code changes
made in the timeline.

Who uses GIT
 Many big names including
◦ Linux/Kernel
◦ Eclipse
◦ Ruby on Rails
◦ Android
◦ PostgreSQL
◦ Git itself.

Why use Git/ Features
 Fast
 Distributed (no central repository)
 Can work offline
 Small (file system usage)
 Has a staging area
 Access control (with gitosis)
 Fit for any project size
 Branching, tags …
 GitHub.com
◦ Reference: http://whygitisbetterthanx.com

Distributed??
 No Central
repository
 All developers
have a working
copy and own
private repo (.git)
 Code transfer
should be done on
non-private repo.
Image Source:
http://coding.smashingmagazine.c
om/2011/07/26/modern-version-
control-with-git-series/

How to use on windows?
 Could not find mature GUI tools like
tortoise SVN.
 Integrated in Eclipse (with plugin) and
NetBeans (good colorful support).
 If you are programmer, you are not
scared of the command line so:
 Download MsysGit :
http://code.google.com/p/msysgit/dow
nloads/list

MsysGit for git on Windows
Steps:
1. Download the exe file (or the portable one, it will not need
installation).
2. Install msysgit , next … next is your friend here with finish – no
need of any fancy configuration.
3. Run the git bash application.

Git bash part of MsysGit

User and line settings for win
 If you are familiar with ~ of unix systems
this might be easy.
 Make sure where your home dir is in
your windows setup like:
◦ /c/users/Geshan – for me in Windows 7
 Set ~/.bash_profile if you want.(google
bash profiles and dot files, if you want to)
 Run this: git config --global core.autocrlf true
 Have a look for new line setting if need be:
http://github.com/guides/dealing-with-newlines-in-git

Introduce yourself to GIT
 execute commands in bash
◦ git config --global user.name <name>
◦ git config --global user.email <email>
◦ (this gets written to your ~/.gitconfig file)
 Example
◦ git config --global user.name “Geshan
Manadhar”
◦ git config --global user.email
“me@somedomain.com”

Some conceptual clarity
 You have a working directory and your
private repo (a .git folder in your dir)
 You always push your changes and
pull changes from another non-private
repository.
Working Dir with git
Public git repo on file system

Preparing your working dir
Nothing significant just created a directory with a file that’s it.

Preparing working dir 2

Working directory made
 Commands used
◦ git init ; to initialize the current dir for git
tracking.
◦ git status; shows current status
◦ git add; put files to stating area
 Variations like
 Git add . ; . Is for all changed files
 Git add /path/to/file ; /c/dir1/file1.txt
 Git add /path/a.*
 etc

First commit
git commit –m “message”;
Files have been put into the local repository (the .git dir
created with git init)
All things are in local so we need to push things to a non-
private repository. For this example I’ll create a local
repository.
Always remember to write concise but meaningful
commit messages.

Creating public repository
A bare passive public repo has been created for pushing code.
Remember the path is /c/users/geshan/gitrepos/testgit.git
Different command : git init --bare;
Now we will link the working directory with this public repo.

Linking working dir with public
repo
Remote repository created in previous slide linked to the working directory.
git remote add <name> <path>
Path can be:
File : /home/geshan/gitrepost/testrepo.git
Remote file: ssh://user1@domain1.com/home/user1/gitrepos/test.git
Gitosis: git@domain1.com:test.git

First push to remote repo
 git push <repo_name>
<branch_name>
 Repo_name is just a alias to the path.
 git push origin master
◦ Default repo when cloned in origin and
default branch is master.

First pull attempt
 Pull is done to get the changes done
by others in the self working directory.
 git pull <repo_name> <branch_name>
 git pull origin master

.gitignore file
 .gitignore file is generally placed in the
root of the working directory.
 As the name suggests it can ignore
certain files from git.
 Generally local config is ignored but a
back up is kept for others, example
database username password config.

Using .gitignore
Scenario:
Local database
settings are
stored in
database.php
file

Continue to push bkp file

Pull by a new developer
A new
developer
will
generally
clone the
project,
than
create
new files.
-Notice
git remote
–v
Git branch
shows
available
branches.

Scenario dev 2 posts code
 Dev 2 changed test.txt and pushed his
code to public repo.

Dev 1 pulled the changes.
 Dev 1 can immediately have the
changed code.

Gitk to know what changed
 execute gitk on a git repo root to get
this.

Other git commands
 git log
 git short log –sne
 git checkout / git branch –b newbranch
 git tag v 1.0 –a “test”
 git fsck
 git push dev feature1; - testing you.

Things to look at
 Reset the code to old version
 Branching with git
 Tagging with git
 How to handle conflict situation
 Other git features and commands
 Check out the git cheat sheet:
http://www.cheat-sheets.org/saved-
copy/git-cheat-sheet.pdf
 For details of hashing etc check the git
internals book.

Happy Git-ing
 Google git
 See videos on youtube
 Find some good podcasts on git
 You will like what you use

Git intro hands on windows with msysgit

More Related Content

What's hot

Viewers also liked

Similar to Git intro hands on windows with msysgit

More from Geshan Manandhar

Recently uploaded

Git intro hands on windows with msysgit