KYOSS Git Copy/Paste (beginner)

gistfile1.md

You will be typing a fair amount into your shell to go with our slides... Here's a convenient place to copy/paste from.

Git Introduction Presentation / Slides:

• https://docs.google.com/presentation/d/1TDnhh4aL3q2Gj_xCqji9pfDZ3abn4zkvLXOnkbCT6AU/edit
• https://gist.github.com/3867510

Recordings of the Presentation:

• http://www.ustream.tv/recorded/26056266
• http://www.ustream.tv/recorded/26057861

Google Plus Event:

• https://plus.google.com/events/c8cnubuje7ueek2q4otuqqhg0tg

Next up: Git Intermediate Presentation / Slides:

• https://docs.google.com/presentation/d/1BqXBo58BVxzZXjtDBOE7Lcz8GOkvzWrF2RQ5NZQSIkg/edit
• https://gist.github.com/4265044

Installing Git

• http://git-scm.com/
• sudo apt-get install git
• sudo yum install git-core
• sudo port install git-core git-extras
• sudo brew install git
• git clone https://github.com/git/git.git

Setting Up Git

git config --global user.name "Bob Smith"
git config --global user.email "bobsmith@gmail.com"
git config --global color.ui auto
git config --global merge.conflictstyle diff3

(extra: "alan's .gitconfig file":https://github.com/zeroasterisk/home/blob/master/.gitconfig if you're interested)

Many of the Commands

Here are many of the commands from the slides... some this should help you keep up while the slides are going by... at the end they repeat a fair amount... so we only display unique commands.

cd
mkdir git
cd git
mkdir kyoss-git-workshop
cd kyoss-git-workshop
git init
echo 'hello, world' > hello.txt
echo 'goodbye, world' > goodbye.txt
git status
git add hello.txt
git status
git add goodbye.txt
git status
git commit
git commit -m "Add hello/goodbye"
git status
echo "hello again" >> hello.txt
git status
git diff
git commit
git commit -m "add more to hello"

Omitting repeated commands... here are a few from the rest of the slides:

git commit -a -m "Some variety"
git log
git log --oneline
git help add
git help status
git help diff
git help commit
git help log
git show

Setting Up GitHub

• http://github.com/

• Create / Login to your account

• Setup your GitHub account

• https://help.github.com/articles/set-up-git

• Look for "Password Caching" for using HTTPS URLs

• Or if you prefer SSH URLs and pubkeys (Alan's recommendation)

• https://help.github.com/articles/generating-ssh-keys

Setting Up a Repository in GitHub

• https://help.github.com/articles/creating-a-new-repository
• https://github.com/new

Continuing with the Commands

git remote add origin 
git remote add origin git@github.com:jsquyres/kyoss-git-repository-github.git
git push origin master
git push
cd $HOME/git
git clone  my-clone
cd $HOME/git/my-clone
cd $HOME/git/kyoss-git-workshop
git pull
git show HEAD

git log --graph

Bonus Points

• http://gitref.org/ - Git Reference
• http://gitready.com/ - Git example walkthroughs, atomic
• http://goo.gl/Pw0Fz - Git Cheat Sheet
• tig - an excellent CLI interface to look through logs
• git-svn - a Git core extension which facilitates integrating Git+SVN
• git-wtf - a Git script helping identify branch sync status across multiple remotes