 |
New Artisans LLC Code to do what you need. |
Git from the bottom up
In my pursuit to understand Git, it’s been helpful for me to understand it from the bottom up — rather than look at it only in terms of its high-level commands. And since Git is so beautifully simple when viewed this way, I thought others might be interested to read what I’ve found, and perhaps avoid the pain I went through finding it.
The following article offers what I’ve learned on this journey so far. I hope it can help others to comprehend this wonderful system, and discover some of the joy I’ve experienced in the past few weeks. NOTE: After receiving more than fifty corrections by e-mail from very helpful readers, I’ve updated the PDF to reflect their input. The date at the front should read “Fri, 2 May 2008” if you have the latest version.
Here is a summary from the table of contents:
- Introduction
- Repository: Directory content tracking
- Introducing the blob
- Blobs are stored in trees
- How trees are made
- The beauty of commits
- A commit by any other name…
- Branching and the power of rebase
- Index Cache: Meet the middle man
- Taking the index cache farther
- To reset, or not to reset
- Last links in the chain: Stashing and the reflog
Diving into Git
This week I decided to convert my Ledger repository over to Git. Previously I’d been using Subversion for about 4 years, and CVS for 1 year before that. There was a brief flirt with Darcs, and Mercurial, but neither ever attracted me enough to convert the repository officially.
Why did I choose Git? Actually, I’d looked at Git before, maybe a year ago, and decided it was too complex and funky. But some recent articles — and new versions of Git — prompted me to look again. Yes, it still looks complex, but then again, UNIX is complex and I’ve never stopped loving that since I made my first terminal connection. In fact, when you look at Git in terms of the UNIX philosophy, rather than as a single application, it starts making a whole lot more sense. (It was written by a UNIX-ish kernel developer, after all).
Migrating my official repository represented a special challenge, because I decided I wanted my entire history, not just the Subversion parts of it. I mean, I wanted to pull the CVS repo out of the archives and thread it along with the Subversion repo into a nice, coherent history going all the way back to version 0.1.
With other tools — even Mercurial — I would have shied away from such an undertaking. But Git not only made it possible, it was even straightforward and rather fun to do. This article chronicles my adventures at manually pasting together a version control history, and how powerfully Git was able to handle this task — which would have been patently impossible using CVS or Subversion.
Read More...A few remarkable Mac apps
Using org-mode as a Day Planner
org-mode. After using it for a month, I've decided to
do a write on how I use org-mode to emulate a day planner,
something like what Franklin Covey provides. I loved those old
systems, the habit of focusing on the current day and keeping
constant notes about what happened. Now I have just such a system
on my computer. Read More...