ChangeLog
v1.5.1 - 24th March 2013
So many people turned out to be using v1.5.0 straight from the develop branch that it seemed best to bump the version to v1.5.1 before final release. Thank you to everyone for the feedback - keep it coming!
New:
- install.sh: now supports INSTALL_INTO environment variable if you want to change the install location (the default is /usr/local/bin)
- git hf pull: bring down and merge changes from the remote master, develop and current branches
- git hf push: a more generic (and long-term) replacement for the ‘feature publish’ et al commands
- git hf feature push -F: new –force feature which will overwrite origin’s copy of the branch with your copy (thanks to bsedat for the patch)
- git hf update: new –no-prune flag to disable ‘git fetch –prune’
Fixed:
- install.sh does not require sudo/root if target folder is writeable (thanks to mborsuk for the patch) - might help folks trying to install using Cygwin
- git hf init: if this command creates the ‘develop’ branch, it now pushes that branch back up to origin automatically
- git hf hotfix start: fetches latest refs from origin before attempting sanity checks; should keep things more consistent
- git hf release start: fetches latest refs from origin before attempting sanity checks; should keep things more consistent
- git hf feature cancel: deletes the local branch even if it contains unmerged changes (thanks to mheap for the patch)
- git hf feature finish: pull down latest changes from origin; avoids manual ‘git hf update’ first
- git hf feature finish: clearer message when a feature has not yet been merged via a GitHub pull request
- git hf feature submit: now supports the VISUAL and EDITOR environment variables (thanks to mbrace for the patch)
- git hf release finish: pull down latest changes from origin; avoids manual ‘git hf update’ first
- git hf hotfix finish: pull down latest changes from origin; avoids manual ‘git hf update’ first
- git hf (feature|hotfix|release) start: refactored to increase amount of shared code
- git hf update: does not switch to master or develop branch if there are no changes to merge in (speed improvement!)
- git hf update: does not push to origin if there are no changes to merge in (speed improvement!)
- merge conflicts: refactored to simplify, standardise the behaviour across all commands
- co-existing with gitflow: you can now install the original gitflow tools and the hubflow tools alongside each other with no file conflicts
- various portability improvements for OS X (thanks to mbrace for the patches)
- Improved README file (thanks to j0k3r for the patch)
- Fixed the poster to recommend the new commands added in v1.5
Dropped:
We’ve removed the following features, as they don’t fit into our core idea of Hubflow as a workflow that is focused on interacting primarily with GitHub:
- git hf feature pull: is now an alias for
git hf pull - git hf feature push: is now an alias for
git hf push - git hf feature track: command deleted
- git hf hotfix pull: is now an alias for
git hf pull - git hf hotfix push: is now an alias for
git hf push - git hf hotfix track: command deleted
- git hf release pull: is now an alias for
git hf pull - git hf release push: is now an alias for
git hf push - git hf release track: command deleted
v1.4.2 - 19th February 2013
Fixed:
- git hf release pull should now work (was incomplete) (thanks to neonal)
- git hf release push should now work (was incomplete) (thanks to neonal)
- Bug fix for incompatibility with Git v1.7.10.2 (Apple Git-33)
v1.4.1 - 12th October 2012
Fixed:
- git hf init now creates a master branch if the repo currently does not have one
v1.4.0 - 3rd October 2012
New:
- git hf hotfix cancel: deletes a hotfix branch that is in progress.
- git hf feature cancel: deletes a feature branch that is in progress.
- git hf feature finish will abort if the feature hasn’t yet been merged via a pull request. You can override this using the -f (force) flag.
Fixed:
- git hf hotfix finish now deletes the remote hotfix branch first, to avoid warnings about partially merged branches.
- git hf feature pull is now as verbose as all of the other commands, so that you can see what is happening
- git hf feature pull now dies correctly if there’s a problem talking to GitHub
- git hf release cancel no longer merges into the develop branch by default.
Removed:
- git hf feature publish: not needed, use git hf feature push instead.