Wow, a man page that is actually readable and understandable.<p>I've been using Linux for years, and never once have I seriously looked at a man page. One of the more useless pieces of advice Linux beginners are given is to `man [tool]`. The documentation often has tonnes of useless information and no examples. It's frustrating, and it's also why projects like tldr[0] have gotten so popular.<p>But, the page linked in the OP is actually brilliant. It's easy to read, has examples, compartmentalises into sections that are relevant to different people. It's a step in the right direction.<p>Note: I'm not saying there aren't other pages like OP. There probably are, but the vast majority are not.<p>[0] <a href="https://github.com/tldr-pages/tldr" rel="nofollow">https://github.com/tldr-pages/tldr</a>
I love that they try to make it assessible. But I disagree with that it would be an acceptable goal in git just to understand a subset of it. You need to understand nearly everything, even the internals. Only then it can really become useful to you.<p>The mistake the community made is putting git on the throne of version control. It's not. It's a tool for experts that can do a lot for you if you know how to use it. But to achieve that it pays the price of not really being assessible.<p>Now that it's in its position, the best thing you can do is to learn it. There is the git book. Read it. Annoying, I know. But that's the gameplan. Not doing it is just dragging out the inevitable.
Both merge and rebase, but no cherry-pick. Goodbye then, I guess.<p>I've seen a dozen of those tools wishing to "simplify" git and they all fail my workflow, which is pretty common I guess, team git with central server and source control.<p>What I use:<p><pre><code> git push with target
git fetch
git checkout
git cherry-pick
git reflog
git log, status, diff obviously.</code></pre>
Useful commands for everyday GitHub usage:<p># apt-get remove git<p># apt-get install svn<p>Then use svn. You can receive and send code to GitHub. GitHub is fully svn compatible =)<p>That can be especially handy for non-tech folks who would have an impossible time with git.