From 1a03c0f1c146d0850e578be5f49657d66aa31087 Mon Sep 17 00:00:00 2001 From: swy7ch Date: Thu, 7 May 2020 12:58:53 +0200 Subject: [PATCH] fix: fix merge in `.local/bin/dot` --- .local/bin/dot | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.local/bin/dot b/.local/bin/dot index 3d19a6b..7f460d5 100755 --- a/.local/bin/dot +++ b/.local/bin/dot @@ -23,23 +23,19 @@ if [ "$1" = "-m" ] ; then shift [ "$1" = "" ] && echo "Please provide a branche to merge from" && exit 1 if [ "$1" != "-a" ] ; then - shift - cmd="" while [ "$1" != "" ] ; do - cmd="$cmd $git checkout $1 && $git merge dev" + $git checkout $1 && $git merge dev shift done - cmd="$cmd && $git checkout dev" else branches="$(echo "$($git branch)" | sed -e 's/\*/ /;t')" - cmd="" for arg in $branches ; do if [ "$arg" != "dev" ] ; then $git checkout $arg && $git merge dev fi done - cmd="$git checkout dev" fi + cmd="$git checkout dev" fi $cmd