diff --git a/update_desktop.sh b/update_desktop.sh index 572d35eee25b43779086c8e2547bc2ee907192ff..b7f2dea7289212460a0df629c8c57c21b5c6bd8a 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