Intro to Git DevOps Tally Presentation 101615

Intro to Git
presented by Brian K. Vagnini
Hosted by

What is version control?
Local Version Control
Centralized Version Control
Distributed Version Control

What is Git
Software that stores a snapshot of your files
Everything is local to your machine
Does a SHA-1 checksum and stores that for each snapshot

Three stages
Modified
Staged
Committed

Three sections of a git project
Working directory
Staging area
git repo

Installing git
Linux - yum install git-core (or apt-get install git-core)
Mac - using macports, sudo port install git-core
or browse to git-scm.com/download/mac
Windows - msysgit.github.com
post install
git config --global user.name ‘Your Name’
git config --global user.email youremail@domain.com

Getting help
Google
Offline:
git help <verb>
git <verb> --help
man git <verb>

Getting started
1- Existing folder with files and no version control
git init
git add .
git commit -m “Your message here”
2- Nothing at all- Cloning an existing repo
git clone https://github.com/vinta/awesome-python.git
or git clone https://github.com/zedshaw/python-lust.git

What about security?
Two options:
1- Host your own server that has git on it
2- Pay github (or others) monthly and you get private repos that you can control
You control who can commit to your project even in the free github accounts

Workflow
1- Ensure that you are on the CORRECT branch. (This is vital later on…)
2- Make modifications to your code. (SAVE the changes.)
3- Add the files to the staging area.
4- Commit the changes to your local repo.
5- Merge your Dev branch with your Master branch.
6- Push the changes to your remote repo.

git init
fivestringbass:EJv2 brian$ touch index.htm
fivestringbass:EJv2 brian$ git init
Initialized empty Git repository in /Users/brian/Google
Drive/Code/JavaScript/EJv2/.git/

git status
fivestringbass:EJv2 brian$ git status
# On branch master
# Initial commit
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
# ch2exa.js
# index.htm
nothing added to commit but untracked files present (use "git add" to track)

git add
fivestringbass:EJv2 brian$ git add .
(You can specify particular files if someone else in your team needs them, or you
can use the period, which signifies adding everything in the current directory and
subdirectories.)

git status (again)
# On branch master
# Initial commit
# Changes to be committed:
# (use "git rm --cached <file>..." to unstage)
# new file: ch2exa.js
# new file: index.htm

git commit
fivestringbass:EJv2 brian$ git commit -m "Initial commit. Start of project."
[master (root-commit) de4ed60] Initial commit. Start of project.
2 files changed, 16 insertions(+)
create mode 100644 ch2exa.js
create mode 100644 index.htm

git status (yet again)
# On branch master
nothing to commit, working directory clean
fivestringbass:EJv2 brian$

Wash, Rinse, and Repeat
How often to commit?
Whenever you make a major change.

Make changes and repeat
# On branch master
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# modified: ch2exa.js
no changes added to commit (use "git add" and/or "git commit -a")

How do I see my changes?
1)git log
2)use gitk --all (MAY need a separate install)

Intro to Git DevOps Tally Presentation 101615

.gitignore
Specifies intentional untracked files & folders that Git should ignore
.DS_Store files (if using a MAC)
data/ ( if you are processing data that is temporary)
Can use regular expressions to specify the pattern to look for
Can ignore all .php files with *.php EXCEPT you can add !index.php to have git
track changes to that one php file

git revert
Used to “undo” a commit.
Similar to the Previous Versions feature in Windows Server.
git revert SHA# or git revert HEAD
git reset --soft SHA# ( resets the HEAD to the point you specify but doesn’t alter
staging index or working directory)
git reset --hard SHA# (very destructive- changes staging index and working
directory to match the repo- all future changes are GONE!)

Remote repositories
to view: git remote -v
to add a remote: make directory (repo.git) on the remote git server, CD to it and
type “git init --bare”
then on your dev machine, cd to your folder, then type “git remote add
REMOTENAME USER@HOST:/USERNAME/REPO_NAME”
for github, it would be: git remote add github
https://github.com/bkvagnini/REPO.git

git branch
To see what branches are available: “git branch”
To create a new branch: “git branch develop”
To use a different branch: “git checkout develop”
To create a new branch and switch to it: “git checkout -b develop
To delete a branch: “git branch -d dev”

git merge
(from your develop branch, in a clean state)
git checkout master
git merge develop
git checkout develop
WRITE CODE!
merge conflicts (look for the >>> and <<< in the document)

Revised workflow
git fetch origin master
git pull origin master
git checkout develop
git merge master
change files
test and verify (The add to staging and commit to local repo steps are done here)
git checkout master
git merge develop
code review
git push origin master

git stash
Saves changes to your code in progress without committing them to the repo
git stash save “message”
git stash list (views stash changes)

Retrieve your stash
git stash pop stash@{0} (removes the changes from the stash)
git stash apply stash@{0} (leaves a copy in the stash)
-Deleting your stash
git stash drop stash@{0}
git stash list to confirm

Intro to Git DevOps Tally Presentation 101615

Recommended

More Related Content

What's hot (20)

Viewers also liked (11)

Similar to Intro to Git DevOps Tally Presentation 101615 (20)

Intro to Git DevOps Tally Presentation 101615

Editor's Notes