summaryrefslogtreecommitdiffstats
path: root/bin/pupdate.sh
diff options
context:
space:
mode:
Diffstat (limited to 'bin/pupdate.sh')
-rwxr-xr-xbin/pupdate.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/pupdate.sh b/bin/pupdate.sh
index 1ed020f..da3bc23 100755
--- a/bin/pupdate.sh
+++ b/bin/pupdate.sh
@@ -208,7 +208,7 @@ Switch_downstream_branch ()
Merge_upstream_version ()
{
- git cherry-pick -n upstream
+ git cherry-pick -n --allow-empty upstream
git commit -a -s -S -m "Merging upstream version ${DEB_UPSTREAM_VERSION}."
}