What you’ll learn

What Git is
How to use it
How to use it to manage local changes
How to use it to contribute to Evergreen

Why use Git locally

Git is not just for the developers and documenters who make changes to Evergreen’s core.
It is often a good idea to stay on the shelf.
But if you must have local changes, make sure you can repeat them.
Actually, let’s step back - first, make sure you know what they are.
Hence, Git

What is Git

Source control system
Keeper of all the history
Communications nexus
Directed acyclic graph manager

Git’s role in Evergreen

Code repository for Evergreen, OpenSRF, and SIPServer
Nexus for communicating changes

I’ve used VCS in the past. What’s special about Git?

Distributed
Cheap branches
Infrastructure and ecosystem

What can you find in a Git repository?

Files
Commits
Branches

How to install Git

Focus will be on command-line
Package managers (e.g., apt-get install git)
OS X — use Xcode or other installers
Windows — Cygwin, SmartGit, TortoiseGit

Creating a Git repository from scratch

Make it

git init

Tell Git who you are

git config user.name "Jane Public"

git config user.email jane@example.org

Putting stuff into a Git repository

vi README

git add README

git commit

Making a change

vi README

git commit -as

Visual whirled changes

git show

git diff

Track history

git log

Referring to stuff

Commit hash
Partial commit hash
Branch name
Tag name

Branching

git checkout -b new_branch

git checkout master

A brief digression into SSH public keys

ssh-keygen

Cloning a Git repository

git clone git://git.evergreen-ils.org/Evergreen

‘git clone git@git.evergreen-ils.org:history’

Remotes

git remote add working git@git.evergreen-ils.org:working/Evergreen

git fetch working

Merging in changes

git fetch remote

git checkout -b test_changes

git merge remote/a_branch

Merging in changes from master

git checkout master

git pull

Pushing out changes

git push working HEAD:user/gmcharlt/stuff

Building Evergreen

Not much different to install from Git
- autoreconf -i
- Dojo
- configure and make

Managing lots of changes

Topic branches
Focused, small commits
- Don’t end up with a commit message like this:

LOCAL: various changes

- OPAC tweaks
- new course reserves module
- fix typo in config file
- experimental bursar inteface - not done yet

Tips and tricks: find stuff

git grep

Tips and tricks: technicolor

We’re not in Kansas, anymore…
- git show --color
- git show --color-words

Tips and tricks: stashing

Commit early and often, but sometimes you get interupted…
- git stash
- git stash apply

Tools that work with Git repositories

tig
gitweb
Gitolite

Nifty tools that can use Git

etckeeper

Git as community integration point

Github
Gitorious

Reading

Git for Grown-ups http://24ways.org/2013/git-for-grownups/
Contextual Git cheatsheet http://startuptechnology.wordpress.com/downloads/
Git Community Book http://alx.github.io/gitbook/
Pro Git book http://git-scm.com/book
How to Git (by Eric Phetteplace) http://acrl.ala.org/techconnect/?p=3062

Using Git to manage Evergreen