From 9e82c96713989a7565eadac505b36e3dbe91cd5a Mon Sep 17 00:00:00 2001 From: Sam Chudnick Date: Sun, 11 Jun 2023 07:56:17 -0400 Subject: Added, removed, renamed scripts --- .local/bin/merge-renovate | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 .local/bin/merge-renovate (limited to '.local/bin/merge-renovate') 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 @@ +#!/bin/sh + +image="$1" +[ "$image" = "" ] && echo "error: no image specified" && exit 1 +git checkout -b renovate/$image master +git pull --no-edit origin renovate/$image +git checkout master +git merge --no-ff --no-edit renovate/$image -- cgit v1.2.3