Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion git-flow
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down
3 changes: 2 additions & 1 deletion git-flow-bugfix
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down
3 changes: 2 additions & 1 deletion git-flow-config
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
#
Expand Down
3 changes: 2 additions & 1 deletion git-flow-feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down
3 changes: 2 additions & 1 deletion git-flow-hotfix
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down
14 changes: 11 additions & 3 deletions git-flow-init
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down Expand Up @@ -66,6 +67,7 @@ h,help! Show this help
showcommands! Show git commands while executing them
d,[no]defaults Use default branch naming conventions
f,[no]force Force setting of gitflow branches, even if already configured
g,[no]sign Sign initial commit when creating a repository

p,feature! Feature branches
b,bugfix! Bugfix branches
Expand All @@ -89,6 +91,7 @@ file= use given config file
DEFINE_boolean 'local' false 'use repository config file'
DEFINE_boolean 'global' false 'use global config file'
DEFINE_boolean 'system' false 'use system config file'
DEFINE_boolean 'sign' false 'sign initial commit when creating a repository' g
DEFINE_string 'file' "" 'use given config file'
DEFINE_string 'feature' "" 'feature branches' p
DEFINE_string 'bugfix' "" 'bugfix branches' b
Expand Down Expand Up @@ -259,8 +262,13 @@ file= use given config file
local created_gitflow_branch=0
if ! git rev-parse --quiet --verify HEAD >/dev/null 2>&1; then
git_do symbolic-ref HEAD "refs/heads/$master_branch"
git_do commit --allow-empty --quiet -m "Initial commit"
created_gitflow_branch=1
if flag sign; then
git_do commit --allow-empty --gpg-sign --quiet -m "initial commit"
created_gitflow_branch=1
else
git_do commit --allow-empty --quiet -m "initial commit"
created_gitflow_branch=1
fi
fi

# Creation of master
Expand Down
3 changes: 2 additions & 1 deletion git-flow-log
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down
3 changes: 2 additions & 1 deletion git-flow-release
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down
3 changes: 2 additions & 1 deletion git-flow-support
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down
3 changes: 2 additions & 1 deletion git-flow-version
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down
3 changes: 2 additions & 1 deletion gitflow-common
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# http://blog.avirtualhome.com/development-workflow-using-git/
#
# Feel free to contribute to this project at:
# http://github.com/petervanderdoes/gitflow
# http://github.com/CJ-Systems/gitflow-cjs
#
# Authors:
# Copyright 2003 CJ Systems. All rights reserved.
# Copyright 2012-2019 Peter van der Does. All rights reserved.
#
# Original Author:
Expand Down