Compare commits
2 Commits
47f3a1f2a9
...
c5a59bb5da
Author | SHA1 | Date |
---|---|---|
giles | c5a59bb5da | |
giles | 47d21392bd |
|
@ -18,15 +18,19 @@ steps:
|
||||||
image: alpine/git:latest
|
image: alpine/git:latest
|
||||||
commands:
|
commands:
|
||||||
- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
|
- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
|
||||||
|
- git log -n 1
|
||||||
- git checkout -b master
|
- git checkout -b master
|
||||||
|
- git log -n 1
|
||||||
- git pull origin master
|
- git pull origin master
|
||||||
|
- git log -n 1
|
||||||
# - git branch -D product-development
|
# - git branch -D product-development
|
||||||
- git checkout -b product-development
|
- git checkout -b product-development
|
||||||
#- git merge format-branch
|
#- git merge format-branch
|
||||||
#- git merge --squash --no-commit --strategy-option=theirs format-branch
|
#- git merge --squash --no-commit --strategy-option=theirs format-branch
|
||||||
|
- git log -n 1
|
||||||
- git checkout format-branch **/*.*
|
- git checkout format-branch **/*.*
|
||||||
- git status
|
- git status
|
||||||
- git log -n 3
|
- git log -n 1
|
||||||
environment:
|
environment:
|
||||||
GIT_PASSWORD:
|
GIT_PASSWORD:
|
||||||
from_secret: GIT_PASSWORD
|
from_secret: GIT_PASSWORD
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue