Version Control Review

Version Control - Definition

What’s version control? →

Motivation

Why would we use version control? (besides being required for this course!) →

Tools

What version control software are we using? →

Some Potential Confusion

What’s the difference between git and github →

More Definitions…

Define the following terms: repository, local repository, remote repository, git and github

And Even More Definitions….

Define the following terms: commit and diff →

Where Are My Files

In your local repository, git stores your files and versions of your files in a few different conceptual places:

• the working directory / working copy - stuff you’ve changed but haven’t saved
• index - stuff that you’re about to save (staging area)
• HEAD - stuff that you’ve already saved

Two Basic Workflows

1. Creating and setting up local and remote repositories
2. Making, saving, and sharing changes

Creating Repositories

• create a local repository
• configure it to use your name and email (for tracking purposes)
• create a remote repository
• link the two

Making, Saving, and Sharing Changes

• make changes
• put them aside so they can staged for saving / committing
• save / commit
• send changes from local repository to remote repository

Github Will Serve as our Remote Repository

• github is a website
• it stores git repositories
  • that means it can store all versions of your files
  • (but only after you’ve sent changes to it)

ALL ASSIGNMENTS ARE REQUIRED TO BE SUBMITTED VIA COMMAND LINE!

git

• git works via the command line
• the base command is git followed by a specific action
• these commands/actions only work when you’re in a git repository
• (that is, you have to cd to the directory that contains your repository)

Commands for Setting Up Local Repositories…

How do you create a local repository? →

git init

git config user.name "your name"
git config user.email "your@email.address"

Commands for Setting Up Remote Repositories…

How do you create a remote repository? →

# for github, you can use curl!
# replace 'your github username' with your username
# replace 'your repository name' with the name you'd like to call your repository
# keep EVERYTHING ELSE as is
curl -u 'your github username' https://api.github.com/user/repos -d '{"name":"your repository name"}'

# replace "your username" and "the url to your repository" appropriately 
# (keep the @ symbol... it means... your user, at that web site)
git remote add origin https://github.com/your github user name/your_repository.git

Summary for Setting Up and Linking Remote and Local Repositories

git init
git config user.name  "your user name"
git config user.email "your@email.address"
curl -u 'your github user name' https://api.github.com/user/repos -d '{"name":"your repository name"}'
git remote add origin https://github.com/your github user name/your_repository.git

Working With Your Files

What’s the typical workflow for changing and saving your files using version control? →

git status

What does git status do? →

git add

# it marks a file or files as ready to be saved

# add all
git add --all 

# add specific file
git add myfile.txt

git commit

What does git commit do? →

# git commit takes a snapshot of your work
# (it saves it!)

# in the directory of your repository
# don't forget the commit message
git commit -m "commit message goes here"

git log

What does git log do?

# git log shows you the commit history of your repository or file
git log

# you can also colorize the output:
git log --color

git diff

What does git diff do? →

# it shows the line-by-line differences between your last commit and your working directory

# use --color for syntax highlighting
git diff --color

Summary for Working With Files

# make changes
# look at the differences between your last save and your current changes
git diff --color

# check on the status of your changes
git status

# "stage" or mark your changes as ready to be saved
git add --all

# check the status again to see that you changes are ready to be saved
git status

# save!
git commit -m "my message"

# show a log of your changes so far
git log --color (show your changes so far)

# send to a remote repository (to submit an assignment)
git push origin master 

All git commands must be run in your repository directory (where you ran git init)

Lab 5, Part 1