Commit 6e9180ae authored by Clive Makamara's avatar Clive Makamara

update dependency:

parent 24c719bf
node_modules/* node_modules/*
npm-debug.log npm-debug.log
npm-debug.log* npm-debug.log*
\ No newline at end of file gitflow/*
db/*
\ No newline at end of file
# git-flow (Dreidev Edition) # git-flow (Dreidev Edition)
[![npm version](https://badge.fury.io/js/gitflow.svg)](https://badge.fury.io/js/gitflow)
A collection of Git extensions to provide high-level repository operations A collection of Git extensions to provide high-level repository operations
for Vincent Driessen's [branching model](http://nvie.com/git-model "original for Vincent Driessen's [branching model](http://nvie.com/git-model "original
blog post"). This fork adds functionality not added to the original branch. [wiki](http://github.com/dreidev/gitflow/wiki) blog post"). This fork adds functionality not added to the original branch. [wiki](http://github.com/dreidev/gitflow/wiki)
......
...@@ -232,9 +232,9 @@ F,[no]fetch Fetch from origin before performing local operation ...@@ -232,9 +232,9 @@ F,[no]fetch Fetch from origin before performing local operation
PROJECT="$(basename $(git rev-parse --show-toplevel))" PROJECT="$(basename $(git rev-parse --show-toplevel))"
breakout-timeline -nf $NAME -p $PROJECT breakout-flow -nf $NAME -p $PROJECT
breakout-timeline -lf $NAME -p $PROJECT -m "Time Required:$TIME_REQUIRED" breakout-flow -lf $NAME -p $PROJECT -m "Time Required:$TIME_REQUIRED"
echo echo
echo "Summary of actions:" echo "Summary of actions:"
...@@ -446,9 +446,9 @@ no-ff! Never fast-forward during the merge ...@@ -446,9 +446,9 @@ no-ff! Never fast-forward during the merge
PROJECT="$(basename $(git rev-parse --show-toplevel))" PROJECT="$(basename $(git rev-parse --show-toplevel))"
breakout-timeline -lf $NAME -p $PROJECT -m "Finished $NAME, merges into $DEVELOP_BRANCH" breakout-flow -lf $NAME -p $PROJECT -m "Finished $NAME, merges into $DEVELOP_BRANCH"
breakout-timeline -xf $NAME -p $PROJECT breakout-flow -xf $NAME -p $PROJECT
helper_finish_cleanup helper_finish_cleanup
} }
...@@ -560,7 +560,7 @@ showcommands! Show git commands while executing them ...@@ -560,7 +560,7 @@ showcommands! Show git commands while executing them
PROJECT="$(basename $(git rev-parse --show-toplevel))" PROJECT="$(basename $(git rev-parse --show-toplevel))"
breakout-timeline -lf $NAME -p $PROJECT -m "Published $NAME sent for review" breakout-flow -lf $NAME -p $PROJECT -m "Published $NAME sent for review"
...@@ -889,8 +889,8 @@ cmd_pause() { ...@@ -889,8 +889,8 @@ cmd_pause() {
PROJECT="$(basename $(git rev-parse --show-toplevel))" PROJECT="$(basename $(git rev-parse --show-toplevel))"
breakout-timeline -lf $NAME -p $PROJECT -m "Took a break" breakout-flow -lf $NAME -p $PROJECT -m "Took a break"
breakout-timeline -hf $NAME -p $PROJECT breakout-flow -hf $NAME -p $PROJECT
echo echo
echo "Summary of actions:" echo "Summary of actions:"
...@@ -934,8 +934,8 @@ cmd_interrupt() { ...@@ -934,8 +934,8 @@ cmd_interrupt() {
PROJECT="$(basename $(git rev-parse --show-toplevel))" PROJECT="$(basename $(git rev-parse --show-toplevel))"
breakout-timeline -lf $NAME -p $PROJECT -m "Was interrupted" breakout-flow -lf $NAME -p $PROJECT -m "Was interrupted"
breakout-timeline -hf $NAME -p $PROJECT breakout-flow -hf $NAME -p $PROJECT
echo echo
...@@ -970,7 +970,7 @@ h,help! Show this help ...@@ -970,7 +970,7 @@ h,help! Show this help
echo "Why were you interrupted?" echo "Why were you interrupted?"
read INTERRUPT_REASON read INTERRUPT_REASON
breakout-timeline -lf $NAME -p $PROJECT -m "Reason for interrupt $INTERRUPT_REASON" breakout-flow -lf $NAME -p $PROJECT -m "Reason for interrupt $INTERRUPT_REASON"
else else
INTERRUPT_REASON="No reason :)" INTERRUPT_REASON="No reason :)"
...@@ -987,7 +987,7 @@ h,help! Show this help ...@@ -987,7 +987,7 @@ h,help! Show this help
git branch -D "$BRANCH-paused" git branch -D "$BRANCH-paused"
breakout-timeline -rf $NAME -p $PROJECT breakout-flow -rf $NAME -p $PROJECT
echo echo
echo "Summary of actions:" echo "Summary of actions:"
...@@ -1029,8 +1029,8 @@ h,help! Show this help ...@@ -1029,8 +1029,8 @@ h,help! Show this help
git_do checkout "$BRANCH" git_do checkout "$BRANCH"
PROJECT="$(basename $(git rev-parse --show-toplevel))" PROJECT="$(basename $(git rev-parse --show-toplevel))"
breakout-timeline -lf $NAME -p $PROJECT -m "Sent $NAME for review" breakout-flow -lf $NAME -p $PROJECT -m "Sent $NAME for review"
breakout-timeline -xf $NAME -p $PROJECT breakout-flow -xf $NAME -p $PROJECT
GIT_URL=$(git config --get remote.origin.url) GIT_URL=$(git config --get remote.origin.url)
......
...@@ -414,7 +414,7 @@ file= use given config file ...@@ -414,7 +414,7 @@ file= use given config file
PROJECT="$(basename $(git rev-parse --show-toplevel))" PROJECT="$(basename $(git rev-parse --show-toplevel))"
breakout-timeline -np $PROJECT breakout-flow -np $PROJECT
if git remote -v | grep github > /dev/null if git remote -v | grep github > /dev/null
......
gitflow @ 82ff372c
Subproject commit 82ff372cb151ec7dc3732e58c8bfc20b943fb98e
...@@ -10,11 +10,16 @@ ...@@ -10,11 +10,16 @@
"files": [ "files": [
"src/" "src/"
], ],
"bin": {
"breakout-flow": "./node_modules/breakout-timeline/bin/index.js"
},
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/dreidev/gitflow.git" "url": "git+https://github.com/dreidev/gitflow.git"
}, },
"os": ["!win32"], "os": [
"!win32"
],
"keywords": [ "keywords": [
"gitflow", "gitflow",
"dreidev", "dreidev",
...@@ -35,7 +40,7 @@ ...@@ -35,7 +40,7 @@
}, },
"homepage": "https://github.com/dreidev/gitflow#readme", "homepage": "https://github.com/dreidev/gitflow#readme",
"dependencies": { "dependencies": {
"breakout-timeline": "0.0.3", "breakout-timeline": "0.0.4",
"commander": "^2.9.0", "commander": "^2.9.0",
"shelljs": "^0.7.6" "shelljs": "^0.7.6"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment