This extension adds support for the feature branching strategy described here in Vincent Driessen's branching model. The implementation used by this extension is similar to the functionality offered by git-flow (AVH Edition).
- Initialize a repository with default or custom values for branch naming (i.e. 'develop', 'master', 'feature/', etc)
- Start/Finish Feature branches from develop, or from other feature branch bases
- Start/Finish Release branches
- Start/Finish Hotfix branches
- Get the status of a git repository
- git (if you have installed VS Code, this should also already exist on your machine)
From the Command Pallette, type in GitFlow and choose the GitFlow: Run GitFlow commands option
Alternately, you can use the shortcut keys listed below to display the gitflow4code commands
- โฅโ/ on Mac
- Ctrl+Alt+/ on Windows
Choose the Initialize Repository command from the list of available gitflow4code commands.
Choose to Initialize with default
(i.e. master
, develop
, feature/
, release/
, & hotfix/
)
Choose to Initialize with custom values
and then specify the values requested
These settings are stored and can be edited at any time by re-running the above commands or by editing in the Settings file.
Choose the Features
command from the list of available gitflow4code commands
If creating a feature branch off of your development branch, choose Start Feature from <develop>
(where develop
is the name of whatever you chose to initialize your development branch)
-- or --
If creating a feature branch off another existing feature branch, choose Start Feature from another feature branch
Then supply the name of your feature branch, and the tool will prefix it with whatever you chose to be the name of your feature branches
When finished with your feature, choose the Features
command from the list of available gitflow4code commands and then choose to Finish Feature
Choose the Releases
command from the list of available gitflow4code commands
Then supply the name of your release branch, and the tool will prefix it with whatever you chose to be the name of your release branches
When finished with your release, choose the Releases
command from the list of available gitflow4code commands and then choose to Finish Release
Then supply the name of the Tag
for this release
Choose the Hotfixes
command from the list of available gitflow4code commands
Then supply the name of your hotfix branch, and the tool will prefix it with whatever you chose to be the name of your hotfix branches
When finished with your hotfix, choose the Hotfixes
command from the list of available gitflow4code commands and then choose to Finish Hotfix
Then supply the name of the Tag
for this hotfix
Choosing this from the gitflow4code commands list will display the current status of the local git repository (same as if running git status
on the command line) and displays it in the OUTPUT
pane
- Redesign command menu
- Add shortcut functionality to finish current feature/release/hotfix via a status bar button
- Ability to configure whether or not branches are local and/or remote tracking branches are deleted after finishing
This project is under constant development. Feedback and suggestions are very welcome and I encourage you to use the Issues list on Github to provide that feedback.
Fork the repository and then run:
$ git clone -b master [email protected]:<username>/gitflow4code.git
cd gitflow4code
The -b master
switch has to be added since the fork operation automatically clones the develop
branch of the repository and cloning it results in a local repository with just a develop
branch.
After that, initialize the local gitflow4code repository with gitflow4code
itself (see Getting Started above).
Then create a feature branch, do your work and commit your changes publishing your feature branch.
When done, open a pull request to your feature branch.