magnusstahre / git-kata

kata for learning git and learning it well

The purpose of this project is to provide practice kata for git to help people learn good and effective habits for source control while using git.

• Reviewing A Change List
• Finding out who deleted a file
• Moving a file while preserving history
• Moving a file and then merging the move into another branch
• Finding Checkins related to a particular bug number
• Finding checkins by a particular person in a particular date range
• Reverting a change list
• Pushing some but not all commits
• How to force a checkout to a branch that has all kinds of wacky changes but no local content

Basic kata

Creating feature branch and pushing

git pull --rebase # ensure we are up-to-date
git checkout -b pants # create a feature branch called "pants"
echo some > left-leg
echo more > right-leg
git add left-leg
git add right-leg
git commit -mv 'I added legs'
git push origin pants

Finding out who deleted a file

$ git log -n 1 -- README
commit 4a7f8ae2993278fa710a8f286ff92a636c6950d7
Author: magnus stahre <[e-mail]>
Date:   Wed Aug 31 20:29:23 2011 -0400

    Rename README to README.md.

Hence, README was removed (actually renamed) in commit 4a7f8ae2993278fa710a8f286ff92a636c6950d7.

Finding commits based on commit message

This finds all commits related to issue SPR-8570 in spring-framework:

$ git log --oneline --grep SPR-8570
7c1c497 Fix typo in SmartLifecycle Javadoc
8760c83 Clarify Lifecycle#stop documentation
e7cb561 Document Lifecycle#stop concurrency semantics

Since this repository was actually cloned from svn, we can also find the corresponding svn commits:

$ git svn log --oneline --grep SPR-8570
r4836 | Fix typo in SmartLifecycle Javadoc
r4831 | Clarify Lifecycle#stop documentation
r4822 | Document Lifecycle#stop concurrency semantics