replace git-flow with git-flow-avh and adjust instructions accordingly #54
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
link to avh wiki instead of abandoned nvie wiki deep link to Windows instructions
| Cheers! Thanks for merging! On a side note, the fixes for being git-describe friendly do slightly modify the branching work-flow and I have not yet had a deeper look at it - so you might need to update your branching pictures as well. Maybe I can have a look at it as well, but don't count on it - I am also buried in work. :) |
| Thanks for the side-note, this is planned during the whole "rework" of the cheatsheet, I also plan to extend it with new feature and possibly a few project workflow examples.. But regarding work - I think most of us are in the same boat in that regard ;) |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
The initial toolset of git-flow at https://github.com/nvie/gitflow is not developed any further (i.e. dead). The last commit is 4 years old.
There are several big issues with the old git-flow tool, the most daunting (i.e.
git describedoes not work):git describeon develop branch doesn't work nvie/gitflow#126The old git-flow does also not support git-flow-specific hooks:
The git-flow AVH Edition from https://github.com/petervanderdoes/gitflow-avh seems to be the commonly agreed on successor to git-flow and is a fork of the original git-flow that addresses these problems. It is backward-compatible with the original git-flow and addresses the above problems.
Therefore I changed the installation instructions and changed them to install git-flow-avh. I have used the instructions from: https://github.com/petervanderdoes/gitflow-avh/wiki/Installation for the individual platforms. However as I am on OS X, I have only tested OS X (ports + brew). The instructions for Linux mention, that on a current Ubuntu
apt-get install git-flowwill install the AVH edition of git-flow anyway. That's why I did not change the Linux installation instructions.Your cheat-sheet is nice and we use it at work for new developers and maybe you consider making the switch to git-flow-avh as well.