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
fb785d14
Commit
fb785d14
authored
Jan 23, 2017
by
cmosh
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/finish_fix' into develop
parents
da1dc069
afbb787a
Changes
15
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
2387 additions
and
370 deletions
+2387
-370
.gitignore
.gitignore
+12
-10
Changes.mdown
Changes.mdown
+11
-11
Makefile
Makefile
+58
-58
README.mdown
README.mdown
+148
-148
gitflow-installer.sh
contrib/gitflow-installer.sh
+78
-78
git-flow
git-flow
+5
-5
git-flow-feature
git-flow-feature
+19
-20
git-flow-hotfix
git-flow-hotfix
+5
-5
git-flow-init
git-flow-init
+13
-13
git-flow-release
git-flow-release
+5
-5
git-flow-support
git-flow-support
+5
-5
git-flow-version
git-flow-version
+5
-5
gitflow-common
gitflow-common
+5
-5
gitflow-shFlags
gitflow-shFlags
+1009
-1
gitflow-shFlags
gitflow-shFlags
+1009
-1
No files found.
.gitignore
View file @
fb785d14
...
...
@@ -8,3 +8,5 @@ debian/*/*
.timelog-feature-workingtime
.seconds-feature-sdsa
.timelog-feature-sdsa
.seconds-feature-finish_fix
.timelog-feature-finish_fix
Changes.mdown
View file @
fb785d14
Makefile
View file @
fb785d14
README.mdown
View file @
fb785d14
contrib/gitflow-installer.sh
View file @
fb785d14
git-flow
View file @
fb785d14
git-flow-feature
View file @
fb785d14
...
...
@@ -358,7 +358,7 @@ cmd_finish() {
exit 1
fi
TOTAL_TIME=
awk '{ sum += $1 } END { print sum }' .seconds-feature-$NAME
TOTAL_TIME=
$(awk '{ sum += $1 } END { print sum }' .seconds-feature-$NAME)
TIME_EXPECTED=line=$(head -n 1 .timelog-feature-$NAME)
seconds=$TOTAL_TIME; FINALTIME=$((seconds/86400))" days "$(date -d "1970-01-01 + $seconds seconds" "+%H hours %M minutes %S seconds")
...
...
@@ -632,4 +632,3 @@ cmd_resume() {
}
\ No newline at end of file
git-flow-hotfix
View file @
fb785d14
git-flow-init
View file @
fb785d14
git-flow-release
View file @
fb785d14
git-flow-support
View file @
fb785d14
git-flow-version
View file @
fb785d14
gitflow-common
View file @
fb785d14
gitflow-shFlags
deleted
120000 → 0
View file @
da1dc069
shFlags/src/shflags
\ No newline at end of file
gitflow-shFlags
0 → 100644
View file @
fb785d14
This diff is collapsed.
Click to expand it.
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