Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitflow
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tools
gitflow
Commits
f7f687ce
Commit
f7f687ce
authored
Jan 21, 2010
by
Vincent Driessen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Also add basic skeleton implementation for the gitflow-feature and gitflow-release subcommands.
parent
61ade55f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
80 additions
and
0 deletions
+80
-0
gitflow-feature
gitflow-feature
+33
-0
gitflow-hotfix
gitflow-hotfix
+11
-0
gitflow-release
gitflow-release
+36
-0
No files found.
gitflow-feature
0 → 100755
View file @
f7f687ce
#!/bin/sh
usage
()
{
echo
"usage: gitflow start feature <name> [<base>]"
echo
" gitflow finish feature <name>"
}
parse_args
()
{
# TODO: Implement the optional base argument
FEATURE
=
"
$1
"
BASE
=
"develop"
if
[
"
$FEATURE
"
=
""
]
;
then
echo
"Missing argument <release>."
usage
exit
1
fi
}
start
()
{
# TODO
parse_args
"
$@
"
gitflow_check_clean_working_tree
echo
"git checkout -b
$FEATURE
$BASE
"
}
finish
()
{
# TODO
parse_args
"
$@
"
gitflow_check_clean_working_tree
echo
"git checkout
$BASE
"
echo
"git merge --no-ff
$FEATURE
"
}
gitflow-hotfix
View file @
f7f687ce
...
@@ -5,8 +5,18 @@ usage() {
...
@@ -5,8 +5,18 @@ usage() {
echo
" gitflow finish hotfix <release>"
echo
" gitflow finish hotfix <release>"
}
}
parse_args
()
{
RELEASE
=
"
$1
"
if
[
"
$RELEASE
"
=
""
]
;
then
echo
"Missing argument <release>."
usage
exit
1
fi
}
start
()
{
start
()
{
# TODO
# TODO
parse_args
"
$@
"
gitflow_check_clean_working_tree
gitflow_check_clean_working_tree
echo
"git checkout -b hotfix-
$RELEASE
master"
echo
"git checkout -b hotfix-
$RELEASE
master"
echo
"Bump version number"
echo
"Bump version number"
...
@@ -15,6 +25,7 @@ start() {
...
@@ -15,6 +25,7 @@ start() {
finish
()
{
finish
()
{
# TODO
# TODO
parse_args
"
$@
"
gitflow_check_clean_working_tree
gitflow_check_clean_working_tree
echo
"git checkout master"
echo
"git checkout master"
echo
"git merge --no-ff hotfix-
$RELEASE
"
echo
"git merge --no-ff hotfix-
$RELEASE
"
...
...
gitflow-release
0 → 100755
View file @
f7f687ce
#!/bin/sh
usage
()
{
echo
"usage: gitflow start release <release>"
echo
" gitflow finish release <release>"
}
parse_args
()
{
RELEASE
=
"
$1
"
if
[
"
$RELEASE
"
=
""
]
;
then
echo
"Missing argument <release>."
usage
exit
1
fi
}
start
()
{
# TODO
parse_args
"
$@
"
gitflow_check_clean_working_tree
echo
"git checkout -b release-
$RELEASE
develop"
echo
"Bump version number"
echo
"Fix bug"
}
finish
()
{
# TODO
parse_args
"
$@
"
gitflow_check_clean_working_tree
echo
"git checkout master"
echo
"git merge --no-ff release-
$RELEASE
"
echo
"git checkout develop"
echo
"git merge --no-ff release-
$RELEASE
"
echo
"git branch -d release-
$RELEASE
"
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment