From ff29d1f863ba57e0aee1e64d508c58c76c55d906 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 5 May 2026 17:37:50 +0200 Subject: [PATCH] projects-dir.mk: push --force-with-lease To make it easier to force-push feature branches, allow that, albeit under --force-with-lease protection. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 98aa2595..4e51fc39 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -318,10 +318,10 @@ get-%: git-get-% # --- git targets git-push push: $(SSH_WRAPPER_SH) - $(PGIT_SH) push $(PGIT_SH_OPTS_NETWORK) + $(PGIT_SH) push $(PGIT_SH_OPTS_NETWORK) --force-with-lease git-push-all: $(SSH_WRAPPER_SH) - $(PGIT_SH) push $(PGIT_SH_OPTS_NETWORK) --all --recurse-submodules=on-demand + $(PGIT_SH) push $(PGIT_SH_OPTS_NETWORK) --force-with-lease --all --recurse-submodules=on-demand git-diff: $(SSH_WRAPPER_SH) $(PGIT_SH) --porcelain diff