If the conceptual boxes of "stash", "workspace",...,"upstream repo" represent a left-to-right timeline of workflow, having "stash" being on the left of "workspace" is somewhat misleading. A stash point-in-time usage can be thought of in the same vertical time-alignment as "index" or "local repository".
If the conceptual boxes represent a storage model, then stash being a separate isolated box is somewhat misleading. The stashes are actually stored in the "local repository". (E.g. an alternative diagram would show "index" and "stash" as nested boxes inside of "local repository".)
I readily admit that spatially rearranging how "stash" is diagrammed complicates the arrows illustrating the git commands. Therefore, maybe the way the cheatsheet did it is the best compromise.
For better or for worse, git really demands that you learn the concepts and fundamentals. It has a steep learning curve, but it's one that easily pays dividends.
Do I wish it were easier to learn? Of course.
Can you substitute actually learning how git and its workflows are used with cheatsheets and quick primers? Not remotely.
That being said, I think this one is a step in the right direction by being interactive. Something like a "git simulator" could be incredibly powerful in teaching people git.
I've been using git for almost 10 years now, and I've read the "concepts and fundamentals" many times, yet I still find these handy. I still google common git tasks, and take the first StackOverflow hit and paste it in my shell.
Knowing the fundamentals doesn't make it any easier to memorize overly-complex sequences of steps. Or maybe it does, but it requires someone smarter than me, or twice as long as it took to get both my college degrees. At what point do we admit that something is just too complicated?
Reading the Git fundamentals is like learning Maxwell's Equations. Great, you know the fundamentals. That doesn't make it easy to complete any possible task using them. I'm still going to use a cheat sheet (like Ohm's Law!) when I can, rather than deriving everything from fundamentals each time.
I think my original wording came off as more harsh than I intended. I was definitely thinking about cheatsheets solely in the context of handing them off to beginners (I am biased towards this since I end up teaching git to a lot of people as part of my job).
Using cheatsheets as cheatsheets, as you describe, is totally fitting. I just often see them either getting handed to beginners as "here you can learn git real quick with this" or intermediate users relying on them to look up things that they should probably have committed to memory by now (a good example escapes me, unfortunately).
The commands are unintuitive, have defaults that nobody uses, and use names that are prone to misinterpretation because they have completely different meanings from what you'd expect.
It's not only difficult to learn; it's difficult to remember the commands and the switches you have to add every single time (why?), and all the extra commands you have to throw in just to get from a checkout to a complete working tree.
Git's UI really needs an overhaul. Unfortunately, I fear it is already too late.
I'm really kind of tired of the "git demands you understand the concepts and the model" excuse because that really isn't what's going on. It's just a poor interface with an un-intuitive set of commands that are organized according to what makes sense to the person who developed the software rather than what makes sense to a person using the software.
Lots of systems demand that you learn the underlying concepts and structures. Indeed, nearly all computer systems demand that when you get to a developer, operations, or admin level. It's actually kind of condescending to keep seeing people repeating that over and over. It's not difficult to understand that git is basically a repository of a repository. If you already understand branching and merging from SVN, it's easy to explain git with a single image[0]. It's still difficult to learn to use git and absolutely nothing about the software eases that transition. Claiming the problem must be with the user and their inability to learn the system should clearly have been incorrect somewhere around 8 years ago when people were still struggling to learn it after it had been out for 5 years.
I imagine some day we'll run into a situation that's similar to apt vs apt-get vs aptitude where there are multiple clients that do the same thing, but it's not clear to me if someone will just create a better product before that time comes along (that product is probably the GitHub client).
I know this pain. Trying to debug a merge conflict for the first time is like trying to do open heart surgery with no prior training.
Whenever I use a computer and I don't have "git unstage", "git discard", "git publish", etc. it feels like I've lost my opposable thumbs
I think that just makes things even more confusing for absolute beginners, but could be useful for advanced beginners and intermediate git learners.
EDIT: I'm realizing this tool will be perfect for creating instructional materials.
It doesn't really show how data moves around the different parts as much as it hints that something moves into these nebulous buckets when you run certain commands.
I think if people new to git can wrap their heads around those, the rest is easier to learn and can be learnt as needed
Here is its Github repo: https://github.com/ndp/git-cheatsheet
wget https://ndpsoftware.com/git-cheatsheet.html#loc=workspace 0.05s user 0.01s system 0% cpu 51.874 total
Edit: Had "Remote Repository" instead of "Upstream Repository".
