detached 6d3fb04

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

commit
6d3fb04738056fb79e0d5474ac3bdf2f90fbb138
author
brice · · 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
Split
UnifiedSplit
M gen/ermite/types.pb.go +3 -2 generated file: collapsed
load diff
M proto/ermite/types.proto +3 -2
@@ -53,8 +53,9 @@ enum MergeMode {
5353 // The target branch moves to the head. No commit is created and the
5454 // signatures of the branch's commits are kept.
5555 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).
5859 // Its author is the author of the first commit of the branch, the other
5960 // authors are added as "Co-authored-by:" trailers, and its message is the
6061 // title, " (!<number>)", a blank line and the list of the squashed commits'
@@ -53,8 +53,9 @@ enum MergeMode {
53 // The target branch moves to the head. No commit is created and the53 // The target branch moves to the head. No commit is created and the
54 // signatures of the branch's commits are kept.54 // signatures of the branch's commits are kept.
55 MERGE_MODE_FAST_FORWARD = 1;55 MERGE_MODE_FAST_FORWARD = 1;
56- // One new commit is created with the tree of the head and the target as56+ // One new commit is created with the tree of the merge of the head into the
57- // only parent, signed by the server's key (see ServerService.GetSigningKey).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 // Its author is the author of the first commit of the branch, the other59 // Its author is the author of the first commit of the branch, the other
59 // authors are added as "Co-authored-by:" trailers, and its message is the60 // authors are added as "Co-authored-by:" trailers, and its message is the
60 // title, " (!<number>)", a blank line and the list of the squashed commits'61 // title, " (!<number>)", a blank line and the list of the squashed commits'

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 2

Tags 18

↑↓ moveenter openesc close