From 8d29e734343ad9b6e5b2c7531b98aaf462ab1d6b Mon Sep 17 00:00:00 2001 From: Lasse Server Date: Mon, 3 Aug 2026 09:30:16 +0200 Subject: [PATCH] upstream-pending: skip merge commits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merges carry no decision, so listing them as unmarked is noise that trains you to ignore the output. Upstream: no — tooling for forks. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ed827fa..5589f88 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ check-fork-divergence: ## Verify the fork differs from upstream only under deplo upstream-pending: ## For a fork: list local commits owed upstream @git fetch --quiet upstream 2>/dev/null || { echo "No 'upstream' remote."; exit 1; } @echo "Marked 'Upstream: yes' and not yet upstream:" - @git log --format=' %h %s' --grep='^Upstream: *[Yy]es' upstream/main..HEAD | grep . || echo " (none)" + @git log --format=' %h %s' --grep='^Upstream: *[Yy]es' --no-merges upstream/main..HEAD | grep . || echo " (none)" @echo @echo "No Upstream: marker — decide, then amend the message:" - @git log --format=' %h %s' --invert-grep --grep='^Upstream:' upstream/main..HEAD | grep . || echo " (none)" + @git log --format=' %h %s' --invert-grep --grep='^Upstream:' --no-merges upstream/main..HEAD | grep . || echo " (none)"