Lecture 2 Making Simple Commits Sign in on the attendance sheet! credit:

Review of Last Lecture Alt Text: If that doesn't fix it, git.txt contains the phone number of a friend of mine who understands git. Just wait through a few minutes of 'It's really pretty simple, just think of branches as...' and eventually you'll learn the commands that will fix everything.

Review of Last Lecture What is a commit? - A snapshot of all the files in a project at a particular time. When we compare commits, it is often more helpful to consider the changes made between two commits – i.e. the commits’ diff.

Review of Last Lecture git init – creates a git repo in the current directory git clone – copies the remote git repo into the current directory git log [ --oneline ] – lists all commits in the git repo, starting with the most recent one git help, git --help, man git – brings up the man help page for the git command

Leftover topics from last lecture The.git folder

Every git repository has a.git directory in the toplevel project directory This is where all git commit objects and metadata are stored Don’t delete it! Doing so deletes the repository

The Simple Git Commit Workflow 1.Inside the working directory, edit your project’s files as needed. 2.Add files with changes you’d like to commit to the staging area. 3.Commit the snapshot of files in the staging area. Edit-Add-Commit

git add Example use: git add scavhunt.c0 puzzle.c0 Updates a file (or files) in the staging area with the version in the working directory.

git commit Example use: git commit (or) git commit –m “commit message goes here” Creates a commit out of a snapshot of the staging area, and updates HEAD.

Aside: commit HEAD The “most recent commit” has a special name: HEAD

git status Example use: git status Shows files differing between the staging area and the working directory (i.e. unstaged changes), the staging area and HEAD (i.e. changes ready to commit), and untracked files

Example – initial state

Example – after autogen.ml edit

Example – after magic.rs edit

Example – after `git add magic.rs`

Example – after making commit (HEAD contains magic.rs (v6), Makefile (v5), autogen.ml (v5))

Example – after `git add autogen.ml` (HEAD contains magic.rs (v6), Makefile (v5), autogen.ml (v5))

Example – after a second git commit (HEAD~1 contains magic.rs (v6), Makefile (v5), autogen.ml (v5), HEAD contains magic.rs (v6), Makefile (v5), autogen.ml (v6))

Good commit messages Good: Build: Don't install jsdom3 on Node.js 0.10 & 0.12 by default Bad: bugfix lol get rekt

git diff Example use: (show unstaged changes) git diff (show staged changes) git diff --cached Shows unstaged changes or staged changes

.gitignore List of files and directories that git should ignore Store in toplevel project directory