| @ -2,7 +2,7 @@ | |||||
| TIMESTAMP=`date "+%Y%m%d%H%M"` | TIMESTAMP=`date "+%Y%m%d%H%M"` | ||||
| git_00_status.sh | |||||
| git_99_status.sh | |||||
| TEST=`git status | grep propre | wc -l` | TEST=`git status | grep propre | wc -l` | ||||
| if [ $TEST -eq 0 ] | if [ $TEST -eq 0 ] | ||||
| @ -16,7 +16,7 @@ then | |||||
| echo # (optional) move to a new line | echo # (optional) move to a new line | ||||
| if [[ $REPLY =~ ^[YyOo]$ ]] | if [[ $REPLY =~ ^[YyOo]$ ]] | ||||
| then | then | ||||
| git_00_checkout_branch.sh develop | |||||
| git_98_checkout_branch.sh develop | |||||
| fi | fi | ||||
| fi | fi | ||||
| @ -3,6 +3,7 @@ | |||||
| CIBLE=$1 | CIBLE=$1 | ||||
| if [ "$CIBLE" == "" ] | if [ "$CIBLE" == "" ] | ||||
| then | then | ||||
| Using $GIT_CURRENT_BRANCH as cible | |||||
| CIBLE=$GIT_CURRENT_BRANCH | CIBLE=$GIT_CURRENT_BRANCH | ||||
| fi | fi | ||||
| @ -10,12 +11,12 @@ git_01_quick_commit.sh | |||||
| if [ ! "$CIBLE" = "$GIT_CURRENT_BRANCH" ]; | if [ ! "$CIBLE" = "$GIT_CURRENT_BRANCH" ]; | ||||
| then | then | ||||
| git_00_checkout_branch.sh $CIBLE | |||||
| git_98_checkout_branch.sh $CIBLE | |||||
| fi | fi | ||||
| git push all | git push all | ||||
| if [ ! "$CIBLE" = "$GIT_CURRENT_BRANCH" ]; | if [ ! "$CIBLE" = "$GIT_CURRENT_BRANCH" ]; | ||||
| then | then | ||||
| git_00_checkout_branch.sh $GIT_CURRENT_BRANCH | |||||
| git_98_checkout_branch.sh $GIT_CURRENT_BRANCH | |||||
| fi | fi | ||||
| @ -3,6 +3,7 @@ | |||||
| CIBLE=$1 | CIBLE=$1 | ||||
| if [ "$CIBLE" == "" ] | if [ "$CIBLE" == "" ] | ||||
| then | then | ||||
| Using $GIT_CURRENT_BRANCH as cible | |||||
| CIBLE=$GIT_CURRENT_BRANCH | CIBLE=$GIT_CURRENT_BRANCH | ||||
| fi | fi | ||||
| @ -29,7 +30,7 @@ then | |||||
| echo # (optional) move to a new line | echo # (optional) move to a new line | ||||
| if [[ $REPLY =~ ^[YyOo]$ ]] | if [[ $REPLY =~ ^[YyOo]$ ]] | ||||
| then | then | ||||
| git_00_checkout_branch.sh develop | |||||
| git_98_checkout_branch.sh develop | |||||
| fi | fi | ||||
| fi | fi | ||||