swytch/dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

cleanup: simplify merge command in dot

Browse Source
This commit is contained in:
David 2020-11-12 19:08:01 +01:00
parent bf136ba0c1
commit 362b7af10d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.local/bin/dot
View File

@ -42,9 +42,7 @@ case $1 in
else else
branches="$(echo "$($git branch)" | sed -e 's/\*/ /;t')" branches="$(echo "$($git branch)" | sed -e 's/\*/ /;t')"
for arg in $branches ; do for arg in $branches ; do
if [ "$arg" != "dev" ] ; then [ "$arg" != "dev" ] && $git checkout $arg && $git merge dev
$git checkout $arg && $git merge dev
fi
done done
fi fi
cmd="$git checkout dev" cmd="$git checkout dev"