Skip to content

Latest commit

 

History

History
73 lines (49 loc) · 2.45 KB

Overview.md

File metadata and controls

73 lines (49 loc) · 2.45 KB

Overview of Git Katas

Cleaning up a bit.

Very basic creation of commits.

interacting with the stage (index).

The first stride into branching.

Cleaning the workspace.

The basics of using the .gitignore file.

An administrative exercise, how do we move a commit that we accidentially put on the wrong branch.

Another exercise on what to do if you have accidentially committed on the wrong branch.

A tour around the most trivial of merges.

A basic merge, involving multiple diverged branches.

A basic merge between diverging branches with incompatible changesets.

A merge confligt with actual code.

A merge has to be reverted, but this causes problems.

Using rebase as an alternative to merging.

A quick exercise in using Git hooks.

We might have created our commits in a suboptimal order, practice to fix that scenario here.

Reset is a powerful and slightly dangerous command if you do not know what you are doing. Go trough the three modes of resetting here.

The first stride into stashing.

Should you accidentially or on purpose delete a commit, go here to try and save it.

A lot of small commits is good when you are working locally, but for sharing your code, it might be more beneficial to deliver your code changes in large sets. Go here to experiment with that.

Submodules are loathed by many. Run through this exercise to see what the ruckus is all about.

Discover what is going on in a Git repo, figure out what it looks like under the hood.

A small exercise into Git internals.