diff options
| author | Sam Chudnick <sam@chudnick.com> | 2023-06-11 07:56:17 -0400 |
|---|---|---|
| committer | Sam Chudnick <sam@chudnick.com> | 2023-06-11 07:56:17 -0400 |
| commit | 9e82c96713989a7565eadac505b36e3dbe91cd5a (patch) | |
| tree | 7c2f998cc9d06f97bfe10ce1ee844121b662f595 /.local/bin/merge-renovate | |
| parent | 3adcf542289a0883924ae9b9be8b898c36702c95 (diff) | |
Added, removed, renamed scripts
Diffstat (limited to '.local/bin/merge-renovate')
| -rwxr-xr-x | .local/bin/merge-renovate | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.local/bin/merge-renovate b/.local/bin/merge-renovate new file mode 100755 index 0000000..ce23161 --- /dev/null +++ b/.local/bin/merge-renovate | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | image="$1" | ||
| 4 | [ "$image" = "" ] && echo "error: no image specified" && exit 1 | ||
| 5 | git checkout -b renovate/$image master | ||
| 6 | git pull --no-edit origin renovate/$image | ||
| 7 | git checkout master | ||
| 8 | git merge --no-ff --no-edit renovate/$image | ||