mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-04-01 13:44:26 +02:00
merge_upstream.sh: Do not recreate patches by default
This commit is contained in:
parent
11adc81230
commit
8b9c72584b
@ -4,11 +4,12 @@ set -e
|
|||||||
|
|
||||||
mydir="$(dirname "$(realpath "$0")")"
|
mydir="$(dirname "$(realpath "$0")")"
|
||||||
|
|
||||||
if [ "$1" = "-k" ]; then
|
# Update patches?
|
||||||
keep_patches=1
|
if [ "$1" = "-u" ]; then
|
||||||
|
keep_patches=0
|
||||||
shift
|
shift
|
||||||
else
|
else
|
||||||
keep_patches=0
|
keep_patches=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pushd "$mydir" > /dev/null
|
pushd "$mydir" > /dev/null
|
||||||
|
Loading…
x
Reference in New Issue
Block a user