fix: tell git to merge
This commit is contained in:
parent
ba615a843b
commit
f580592b7e
1 changed files with 1 additions and 0 deletions
|
@ -10,6 +10,7 @@ pipeline:
|
||||||
- "echo \"[gitea.nulo.in]:420 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHgHIbf5/jkeyLMndnWlEO12DPj41YPqkmz+aIreVOsP\" >> ~/.ssh/known_hosts"
|
- "echo \"[gitea.nulo.in]:420 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHgHIbf5/jkeyLMndnWlEO12DPj41YPqkmz+aIreVOsP\" >> ~/.ssh/known_hosts"
|
||||||
- "eval $(ssh-agent -s)"
|
- "eval $(ssh-agent -s)"
|
||||||
- "echo \"$${SSH_KEY}\" | base64 -d | ssh-add -"
|
- "echo \"$${SSH_KEY}\" | base64 -d | ssh-add -"
|
||||||
|
- "git config pull.rebase false"
|
||||||
- "git config user.name Woodpecker"
|
- "git config user.name Woodpecker"
|
||||||
- "git config user.email ci@nulo.in"
|
- "git config user.email ci@nulo.in"
|
||||||
- "git remote add nulo ssh://_gitea@gitea.nulo.in:420/Sutty/gems.git"
|
- "git remote add nulo ssh://_gitea@gitea.nulo.in:420/Sutty/gems.git"
|
||||||
|
|
Loading…
Reference in a new issue