From 0905c99fbd9b2d4d3007dafb78034695f63f7f41 Mon Sep 17 00:00:00 2001
From: Pavel Kirilin <win10@list.ru>
Date: Fri, 31 Jul 2020 02:12:50 +0400
Subject: [PATCH] Updated update_desktop script.
Signed-off-by: Pavel Kirilin <win10@list.ru>
---
update_desktop.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/update_desktop.sh b/update_desktop.sh
index 572d35e..b7f2dea 100644
--- a/update_desktop.sh
+++ b/update_desktop.sh
@@ -9,8 +9,8 @@ function full_update(){
git checkout -b master
git checkout -b "$apply_branch"
- for branch in $(git branch -a | grep -Ev 'master|remotes' | cut -c 3-);do
- git merge "$branch"
+ for branch in $(git branch -a | grep -Ev 'master|remotes' | grep 'patch/' | cut -c 3-);do
+ git merge "$branch" --no-edit
done
local_update
--
GitLab