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
ddd9dfe9
Commit
ddd9dfe9
authored
Oct 05, 2010
by
Vincent Driessen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tidy up a bit.
parent
3ef45cd4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
16 deletions
+10
-16
git-flow-feature
git-flow-feature
+4
-6
git-flow-hotfix
git-flow-hotfix
+3
-5
git-flow-release
git-flow-release
+3
-5
No files found.
git-flow-feature
View file @
ddd9dfe9
...
@@ -231,8 +231,8 @@ cmd_start() {
...
@@ -231,8 +231,8 @@ cmd_start() {
cmd_finish() {
cmd_finish() {
DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
DEFINE_boolean rebase false
'rebase instead of merge'
r
DEFINE_boolean rebase false
"rebase instead of merge"
r
DEFINE_boolean keep false
'keep branch after performing finish'
k
DEFINE_boolean keep false
"keep branch after performing finish"
k
parse_args "$@"
parse_args "$@"
expand_nameprefix_arg
expand_nameprefix_arg
...
@@ -346,9 +346,7 @@ helper_finish_cleanup() {
...
@@ -346,9 +346,7 @@ helper_finish_cleanup() {
fi
fi
if flag keep; then
if noflag keep; then
echo "Keep this branch" > /dev/null
else
git branch -d "$BRANCH"
git branch -d "$BRANCH"
fi
fi
...
@@ -357,7 +355,7 @@ helper_finish_cleanup() {
...
@@ -357,7 +355,7 @@ helper_finish_cleanup() {
echo "- The feature branch '$BRANCH' was merged into '$DEVELOP_BRANCH'"
echo "- The feature branch '$BRANCH' was merged into '$DEVELOP_BRANCH'"
#echo "- Merge conflicts were resolved" # TODO: Add this line when it's supported
#echo "- Merge conflicts were resolved" # TODO: Add this line when it's supported
if flag keep; then
if flag keep; then
echo "- Feature branch '$BRANCH'
has been kept
"
echo "- Feature branch '$BRANCH'
is still available
"
else
else
echo "- Feature branch '$BRANCH' has been removed"
echo "- Feature branch '$BRANCH' has been removed"
fi
fi
...
...
git-flow-hotfix
View file @
ddd9dfe9
...
@@ -194,7 +194,7 @@ cmd_finish() {
...
@@ -194,7 +194,7 @@ cmd_finish() {
DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u
DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u
DEFINE_string message "" "use the given tag message" m
DEFINE_string message "" "use the given tag message" m
DEFINE_boolean push false "push to $ORIGIN after performing finish" p
DEFINE_boolean push false "push to $ORIGIN after performing finish" p
DEFINE_boolean keep false
'keep branch after performing finish'
k
DEFINE_boolean keep false
"keep branch after performing finish"
k
parse_args "$@"
parse_args "$@"
require_version_arg
require_version_arg
...
@@ -258,9 +258,7 @@ cmd_finish() {
...
@@ -258,9 +258,7 @@ cmd_finish() {
fi
fi
# delete branch
# delete branch
if flag keep; then
if noflag keep; then
echo "Keep this branch" > /dev/null
else
git branch -d "$BRANCH"
git branch -d "$BRANCH"
fi
fi
...
@@ -280,7 +278,7 @@ cmd_finish() {
...
@@ -280,7 +278,7 @@ cmd_finish() {
echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'"
echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'"
echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'"
echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'"
if flag keep; then
if flag keep; then
echo "- Hotfix branch '$BRANCH'
has been kept
"
echo "- Hotfix branch '$BRANCH'
is still available
"
else
else
echo "- Hotfix branch '$BRANCH' has been deleted"
echo "- Hotfix branch '$BRANCH' has been deleted"
fi
fi
...
...
git-flow-release
View file @
ddd9dfe9
...
@@ -197,7 +197,7 @@ cmd_finish() {
...
@@ -197,7 +197,7 @@ cmd_finish() {
DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u
DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u
DEFINE_string message "" "use the given tag message" m
DEFINE_string message "" "use the given tag message" m
DEFINE_boolean push false "push to $ORIGIN after performing finish" p
DEFINE_boolean push false "push to $ORIGIN after performing finish" p
DEFINE_boolean keep false
'keep branch after performing finish'
k
DEFINE_boolean keep false
"keep branch after performing finish"
k
parse_args "$@"
parse_args "$@"
require_version_arg
require_version_arg
...
@@ -263,9 +263,7 @@ cmd_finish() {
...
@@ -263,9 +263,7 @@ cmd_finish() {
fi
fi
# delete branch
# delete branch
if flag keep; then
if noflag keep; then
echo "Keep this branch" > /dev/null
else
git branch -d "$BRANCH"
git branch -d "$BRANCH"
fi
fi
...
@@ -287,7 +285,7 @@ cmd_finish() {
...
@@ -287,7 +285,7 @@ cmd_finish() {
echo "- The release was tagged '$tagname'"
echo "- The release was tagged '$tagname'"
echo "- Release branch has been back-merged into '$DEVELOP_BRANCH'"
echo "- Release branch has been back-merged into '$DEVELOP_BRANCH'"
if flag keep; then
if flag keep; then
echo "- Release branch '$BRANCH'
has been kept
"
echo "- Release branch '$BRANCH'
is still available
"
else
else
echo "- Release branch '$BRANCH' has been deleted"
echo "- Release branch '$BRANCH' has been deleted"
fi
fi
...
...
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