THIS IS A TEST INSTANCE. ALL YOUR CHANGES WILL BE LOST!!!!
Note that there are a couple of versions of the git-flow script floating around. The AVH version (https://github.com/petervanderdoes/gitflow/) is newer preferred over https://github.com/nvie/gitflow.
If you've read up on our new process for GEODE Code contributions, you'll know that you need to download and install git-flow.
A good starting point is the git-flow cheatsheet. See also this Atlassian Gitflow Workflow Tutorial. The Installation page covers Windows, Linux and Mac.
1.8.0 (AVH Edition)
Linux:
Cent OS/RedHat:
- Append /usr/local/bin to $PATH in .bashrc
- Download and execute gitflow-installer.sh
| Code Block |
|---|
wget --no-check-certificate -q https://raw.github.com/petervanderdoes/gitflow/develop/contrib/gitflow-installer.sh
chmod +x gitflow-installer.sh
sudo ./gitflow-installer.sh install stable |
...
Mac OS X:
...
| Code Block |
|---|
brew install git-flow-avh |
...
Windows:
See Installing on Windows -- I updated cygwin and then found their wget command syntax was wrong; below is what worked for me:
- Update cygwin and make sure latest version of git is installed.
- Download and execute gitflow-installer.sh
...
| Code Block |
|---|
wget -nd - |
...
nv --no-check-certificate -q https://raw.github.com/ |
...
petervanderdoes/gitflow |
...
/develop/contrib/gitflow-installer.sh |
...
Both --no-clobber and --convert-links were specified, only --convert-links will be used.
github.com/nvie/git 100%[=====================>] 2.09K --.-KB/s in 0s
| Code Block |
|---|
chmod +x github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh |
### gitflow no-make installer ###
Installing git-flow to /usr/local/bin
Cloning repo from GitHub to gitflow
Cloning into 'gitflow'...
remote: Counting objects: 1407, done.
remote: Total 1407 (delta 0), reused 0 (delta 0), pack-reused 1407
Receiving objects: 100% (1407/1407), 623.35 KiB | 670.00 KiB/s, done.
Resolving deltas: 100% (689/689), done.
Checking connectivity... done.
Updating submodules
Submodule 'shFlags' (git://github.com/nvie/shFlags.git) registered for path 'shFlags'
Cloning into 'shFlags'...
remote: Counting objects: 454, done.
remote: Total 454 (delta 0), reused 0 (delta 0), pack-reused 454
Receiving objects: 100% (454/454), 130.91 KiB | 0 bytes/s, done.
Resolving deltas: 100% (337/337), done.
Checking connectivity... done.
Submodule path 'shFlags': checked out '2fb06af13de884e9680f14a00c82e52a67c867f1'
âgitflow/git-flowâ -> â/usr/local/bin/git-flowâ
âgitflow/git-flow-initâ -> â/usr/local/bin/git-flow-initâ
âgitflow/git-flow-featureâ -> â/usr/local/bin/git-flow-featureâ
âgitflow/git-flow-hotfixâ -> â/usr/local/bin/git-flow-hotfixâ
âgitflow/git-flow-releaseâ -> â/usr/local/bin/git-flow-releaseâ
âgitflow/git-flow-supportâ -> â/usr/local/bin/git-flow-supportâ
âgitflow/git-flow-versionâ -> â/usr/local/bin/git-flow-versionâ
âgitflow/gitflow-commonâ -> â/usr/local/bin/gitflow-commonâ
install stable |
Reinitializing
Note: git flow init adds the following lines to the .git/config file in your local repo:
[gitflow "branch"] master = master
develop = develop
[gitflow "prefix"]
feature = feature/
release = release/
hotfix = hotfix/
support = support/
versiontag = v
If you need to redo the git flow init, simply execute:
| Code Block |
|---|
git flow init -f |
Uninstalling
Mac OS X:
| Code Block |
|---|
brew unlink git-flow |
Linux:
| Code Block |
|---|
sudo yum erase gitflow |
...