A few days ago, I posted a cheat sheet for Git (just as last time, Git is a really cool revision control system). Let’s face it: it was ugly. Not something you would actually hang up where other people could see it, was it? Here’s the remedy, which also works on both A4 and Letter and is more detailed.
In more detail, the additional details are:
- The old “structure overview” diagram showing the big picture of repositories and working trees is now a lot bigger and a lot more detailed. It comes along with a glossary, a few notes on getting started, a list of useful tools you may want to look at, and links to the most important websites of all (cough).
- The whole workflow diagram is gone since it was not really all that clear. Instead, some of the groups of commands are connected with lines, indicating in which sequence you’ll probably use some of these commands.
- Some commands have shuffled around a bit, and there’s a new box with information on Git’s configuration options.
- In order to fit it all together, it’s now a two-sided cheat sheet. The “front” side has overview-style things on it and the “back” side is mostly a command reference.
So how’s it look like? Observe:
Because Inkscape saw fit to generate annoyingly huge PDF files from the source, this time you get a zipped two-page PDF document as well as the Inkscape source files.
- Git Cheat Sheet, version 2 (PDF in ZIP archive, 1.6 MB compressed)
- Git Cheat Sheet, version 2 front side (Inkscape SVG)
- Git Cheat Sheet, version 2 back side (Inkscape SVG)
Another thing that I didn’t pay attention to last time was the license. No longer: this cheat sheet is licensed to you under the terms of a Creative Commons Attribution-NonCommercial 3.0 license. For attribution, should you want to create a derived work, please include a mention of http://git.jk.gs/ and, if available space permits, my name.
I still do not entirely understand the phrase “commercial use”. Obviously I am not allowed to sell your cheat sheet, but may I use it to look up commands when I’m working on a business project?
Don’t worry: the license covers only modification (reproduction) and distribution. In other words, just looking at the document is not restricted in any way. If, on the other hand, you sold copies of the document or sold your own work based directly on the contents of the document (i.e. copying substantial parts of it), that would be commercial use as restricted by the license. See sections 4b and 3 of the full license text for the gory details.
I referred to your page from my blog, I hope you do not mind :). Thanks for the cheat sheet
I certainly don’t. Thanks for considering it worth linking to. ;)
Thanks a lot for this one! The “big picture” really helped me to get some things clear and the reference is also very useful. Now I know immediately which man-page to read. I think I will have it in reach always :)
Sounds great and helpful. thx.
(hello jan!)
Hey,
maybe you’d want to advertise color.ui instead of color.branch, color.diff and color.status.
I’m not sure if I would describe core.compression. I have never changed this value and consider myself a fairly advanced git user. Maybe point the user to Documentation/config.txt instead? But hey, it’s your cheat sheet and it might be of some value for my co-workers.
Thanks.
Thanks for the feedback, Matthias! color.ui is definitely a good thing to put on there. It isn’t because it didn’t exist yet when I made that version of the cheat sheet.
To be honest, I hadn’t really used Git much myself when I made the cheat sheet. That has changed. I might very well give it a major overhaul when I find the time.