From 4148266ed0d4edeba8b75223820a34a5a9ca2eb8 Mon Sep 17 00:00:00 2001 From: Timo Reimann Date: Fri, 10 Mar 2017 21:32:34 +0100 Subject: [PATCH] .github/rpr.sh: Use --force-with-lease instead of --force. This prevents accidentally overriding a branch that has been changed remotely by another party. --- .github/rpr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/rpr.sh b/.github/rpr.sh index 656266f1d..8049088c0 100755 --- a/.github/rpr.sh +++ b/.github/rpr.sh @@ -33,4 +33,4 @@ trap clean EXIT .github/cpr.sh $pr git rebase $base -git push -f $remote $branch +git push --force-with-lease $remote $branch