git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] contrib/rerere-train: avoid useless gpg sign in training

From
Celeste Liu <coelacanthus@outlook.com>
Date
Jul 19, 2022, 11:40 UTC
Message-ID
<PH7PR14MB5594D28D5CF94BD30DB9D3C4CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>
Signed-off-by: Celeste Liu <coelacanthus@outlook.com>
---
 contrib/rerere-train.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 26b724c8c6..bd01e430ef 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -75,7 +75,7 @@ do
 		continue
 	fi
 	git checkout -q "$parent1^0"
-	if git merge $other_parents >/dev/null 2>&1
+	if git merge --no-gpg-sign $other_parents >/dev/null 2>&1
 	then
 		# Cleanly merges
 		continue

-- 
2.37.1
Next: Junio C Hamano
Message 1 of 3 in “contrib/rerere-train: avoid useless gpg sign in training”
  1. contrib/rerere-train: avoid useless gpg sign in trainingCeleste Liu, Jul 19, 2022
  2. Junio C HamanoJul 19, 2022
  3. Celeste LiuJul 19, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.