docs(proto): a squash commit takes the tree of the merge into the target

commit: 6d3fb04738056fb79e0d5474ac3bdf2f90fbb138
author: brice · 3d ago · 2026-10-19 14:46 UTC
parent: 5404729
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email
checks: 4/4

2 files · +6 -4

M gen/ermite/types.pb.go +3 -2


@@ -39,8 +39,9 @@ const (
39	39		// The target branch moves to the head. No commit is created and the
40	40		// signatures of the branch's commits are kept.
41	41		MergeMode_MERGE_MODE_FAST_FORWARD MergeMode = 1
42		-	// One new commit is created with the tree of the head and the target as
43		-	// only parent, signed by the server's key (see ServerService.GetSigningKey).
	42	+	// One new commit is created with the tree of the merge of the head into the
	43	+	// target (the tree of the head when the target is its ancestor) and the
	44	+	// target tip as only parent, signed by the server's key (see ServerService.GetSigningKey).
44	45		// Its author is the author of the first commit of the branch, the other
45	46		// authors are added as "Co-authored-by:" trailers, and its message is the
46	47		// title, " (!<number>)", a blank line and the list of the squashed commits'

 	// The target branch moves to the head. No commit is created and the
 	// signatures of the branch's commits are kept.
 	MergeMode_MERGE_MODE_FAST_FORWARD MergeMode = 1
-	// One new commit is created with the tree of the head and the target as
+	// One new commit is created with the tree of the merge of the head into the
-	// only parent, signed by the server's key (see ServerService.GetSigningKey).
+	// target (the tree of the head when the target is its ancestor) and the
+	// target tip as only parent, signed by the server's key (see ServerService.GetSigningKey).
 	// Its author is the author of the first commit of the branch, the other
 	// authors are added as "Co-authored-by:" trailers, and its message is the
 	// title, " (!<number>)", a blank line and the list of the squashed commits'

M proto/ermite/types.proto +3 -2


@@ -53,8 +53,9 @@ enum MergeMode {
53	53		// The target branch moves to the head. No commit is created and the
54	54		// signatures of the branch's commits are kept.
55	55		MERGE_MODE_FAST_FORWARD = 1;
56		-	// One new commit is created with the tree of the head and the target as
57		-	// only parent, signed by the server's key (see ServerService.GetSigningKey).
	56	+	// One new commit is created with the tree of the merge of the head into the
	57	+	// target (the tree of the head when the target is its ancestor) and the
	58	+	// target tip as only parent, signed by the server's key (see ServerService.GetSigningKey).
58	59		// Its author is the author of the first commit of the branch, the other
59	60		// authors are added as "Co-authored-by:" trailers, and its message is the
60	61		// title, " (!<number>)", a blank line and the list of the squashed commits'

   // The target branch moves to the head. No commit is created and the
   // signatures of the branch's commits are kept.
   MERGE_MODE_FAST_FORWARD = 1;
-  // One new commit is created with the tree of the head and the target as
+  // One new commit is created with the tree of the merge of the head into the
-  // only parent, signed by the server's key (see ServerService.GetSigningKey).
+  // target (the tree of the head when the target is its ancestor) and the
+  // target tip as only parent, signed by the server's key (see ServerService.GetSigningKey).
   // Its author is the author of the first commit of the branch, the other
   // authors are added as "Co-authored-by:" trailers, and its message is the
   // title, " (!<number>)", a blank line and the list of the squashed commits'