Vincent’s Git workflow is powerful and simple. So it is the best one for most of us. When you tell somebody that you aren’t using it then they expect a pretty convincing explanation why not. There isn’t much to make sense of really.
gitflow-avh is the easiest way to use it. I tried doing it manually but it is easier to use the plugin. Here are some of the differences if you want compare the plugin with doing it manually. It is worth trying out manually if you want to appreciate the plugin, maybe.
This and this cheat-sheet aren’t all you need to know but they are a fine start.
This is what I use most of the time when I don’t need 4096 feature branches.
Cool thing is that even when you do need 4096 feature branches that this still makes total sense. Add some client releases and QA branches and it still works fine.
Key though is that it is really is this simple.
GOGS is “A painless self-hosted Git service.”
When you don’t want to manually bisect and test by hand, git-polish-history claims to do it for you.
Via Mostly Software.
By my idiosyncratic measures:
For small changes
git diff and
vc-diff are perfect.
For medium changes
magit is perfect.
For large changes DeltaWalker is perfect.
This article communicates a very nice Git branching model.
This is how. It really is that simple.