CastRoller

This episode goes over some of the common or interesting options to 'git diff', showing how to see what has changed between your last commit and your staged files, unstaged files, all changed files or another commit. We also demonstrate how to create and apply patchfiles and how to view changed file stats using diff.

This episode goes over some of the common or interesting options to 'git diff', showing how to see what has changed between your last commit and your staged files, unstaged files, all changed files or another commit. We also demonstrate how to create and apply patchfiles and how to view changed file stats using diff.

This episode shows how to add other git projects as submodules to your own, how to update them in your project and how to keep up to date with them in another developers project. It also, as a side note, shows how to develop a simple ruby web application on Rack.

This episode of GitCasts demonstrates how to setup mSysGit on Windows and goes through some basic workflow using the Windows Git version, in an attempt to partially dispel rumors that Git is unsupported or difficult to get going on Windows. I assume previous knowledge of Git here - this just shows you how to install and do the things you have already learned in the other screencasts.

I've been getting a lot of feedback on the talk that I gave at RailsConf 2008 and a number of people have requested that I do a voiceover of the slides, so here you go. It's not quite as lively as in person, as I gave the talk at 6:30 in the morning in my living room to my cats, but you get the idea. Overall, it should serve as a pretty good Git primer for those of you that are new to Git. Hope you enjoy it. Warning - it's much longer than the normal GitCasts episodes at nearly an hour.

This screencast demonstrates how to create empty branches in Git - that is, branches that are not derivatives of your main branches, but entirely new projects. In the screencast, I create an empty branch to store the website code in for my project, so I don't have to store it as a subdirectory of my main project.

This screencast demonstrates a distributed workflow. It takes two personas, creating a project in GitHub and pushing to it in the first persona, then cloning that project in the second. The second sets up a public, read-only HTTP repository on his own server. The first then fetches from that, merges changes and pushes back to GitHub. It also demonstrates an instance in which the Author and Committer fields can differ for a commit.

This screencast follows roughly the same course as the previous one on branching and merging, only I replace merging with rebasing. This screencast also demonstrates the interactive rebase command git rebase -i. I also demonstrate some slightly more complex branching, by using both interactive and normal rebasing techniques simultaneously on separate branches, then choosing one and deleting the other.

In this screencast, we take you through a workflow where we branch, stash and merge several times. It demonstrates the branch and show-branch commands, how to switch branches, how to stash changes, how to list and apply stashes, how to resolve conflicts, how to create and delete topic branches, and what fast-forward merges are.

In this episode, I show how to browse and inspect raw Git objects. The major tools covered are the git cat-file and git ls-tree commands to inspect the object contents, and then I cover some of the included graphical browsers, gitk and gitweb.