1<!doctype html>
2<html lang="en">
3<head>
4<meta charset="utf-8">
5<meta name="viewport" content="width=device-width, initial-scale=1">
6<meta name="color-scheme" content="light dark">
7<title>SHA7 merge the side branch · diffs · example.test</title>
8<meta name="theme-color" media="(prefers-color-scheme: light)" content="#ffffff">
9<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#0c0c0c">
10<meta name="apple-mobile-web-app-title" content="ermite">
11<link rel="icon" type="image/svg+xml" href="/-/static/img/icon.HASH.svg">
12<link rel="apple-touch-icon" href="/-/static/app/apple-touch-icon.HASH.png">
13<link rel="manifest" href="/-/static/app/manifest.HASH.webmanifest">
14<link rel="preload" href="/-/static/fonts/atkinson-next.HASH.woff2" as="font" type="font/woff2" crossorigin>
15<link rel="stylesheet" href="/-/static/css/ermite.HASH.css">
16<meta name="htmx-config" content='{"history":false,"includeIndicatorCSS":false,"extensions":"sse, hx-live"}'>
17<script src="/-/static/js/htmx.min.HASH.js" defer>
18</script>
19<script src="/-/static/js/hx-live.min.HASH.js" defer>
20</script>
21<script src="/-/static/js/hx-sse.min.HASH.js" defer>
22</script>
23<script src="/-/static/js/store.HASH.js">
24</script>
25<script src="/-/static/js/ermite.HASH.js" defer>
26</script>
27<script src="/-/static/js/files.HASH.js" defer>
28</script>
29<script src="/-/static/js/passkey.HASH.js" defer>
30</script>
31<script src="/-/static/js/log.HASH.js" defer>
32</script>
33<script src="/-/static/js/lazy.HASH.js" defer>
34</script>
35</head>
36<body data-ref="" data-sha="SHA40" data-sel="" data-nav="" data-paths="/diffs/paths/SHA40" data-blob="/diffs/blob/SHA40">
37<a class="skip" href="#main">skip to content</a>
38<header class="hdr">
39<div class="hdr-top">
40<a class="brand" href="/" data-g="h" aria-label="home" title="home (g h)">
41<span class="brand-mark" aria-hidden="true">
42</span>
43</a>
44<nav class="crumbs" aria-label="Path">
45<ol>
46<li>
47<a href="/diffs">diffs</a>
48</li>
49<li>
50<a href="/diffs/commits/main">commit</a>
51</li>
52<li>
53<span aria-current="page">SHA7</span>
54</li>
55</ol>
56</nav>
57<div class="hdr-acts">
58<a class="btn ref" href="/diffs/refs" data-fire="refs" aria-keyshortcuts="b" title="switch branch or tag (b)">
59<span class="ico i-branch" aria-hidden="true">
60</span>
61<span class="ref-name">detached</span>
62<span class="sha">SHA7</span>
63</a>
64<button type="button" class="btn search" data-js aria-haspopup="dialog" aria-controls="panel-cmd" aria-keyshortcuts="Control+K :" title="go to a section, ref, file or repo (ctrl k or :)" data-fire="cmd">
65<span class="ico i-search" aria-hidden="true">
66</span>
67<span class="search-label">Go to…</span>
68<kbd aria-hidden="true">ctrl k</kbd>
69</button>
70</div>
71</div>
72<nav class="tabs" aria-label="Sections">
73<ul>
74<li>
75<a href="/diffs" data-key="s" aria-keyshortcuts="s">Summary <kbd aria-hidden="true">s</kbd>
76</a>
77</li>
78<li>
79<a href="/diffs/tree/main" data-key="t" aria-keyshortcuts="t">Files <kbd aria-hidden="true">t</kbd>
80</a>
81</li>
82<li>
83<a href="/diffs/commits/main" data-key="c" aria-keyshortcuts="c" aria-current="page">Commits <kbd aria-hidden="true">c</kbd>
84</a>
85</li>
86<li>
87<a href="/diffs/refs" data-key="r" aria-keyshortcuts="r">Branches & tags <kbd aria-hidden="true">r</kbd>
88</a>
89</li>
90<li>
91<a href="/diffs/merge-requests" data-key="m" aria-keyshortcuts="m">Merge requests <kbd aria-hidden="true">m</kbd>
92</a>
93</li>
94<li>
95<a href="/diffs/actions" data-key="a" aria-keyshortcuts="a">Actions <kbd aria-hidden="true">a</kbd>
96</a>
97</li>
98</ul>
99</nav>
100</header>
101<div class="work has-rail">
102<main id="main" tabindex="-1">
103<header class="show">
104<h1>merge the side branch</h1>
105<dl class="kv show-kv">
106<dt>commit</dt>
107<dd>SHA40</dd>
108<dt>author</dt>
109<dd>T · <time datetime="STAMP" title="STAMP">AGO</time> · STAMP</dd>
110<dt>merge of</dt>
111<dd>
112<a href="/diffs/commit/SHA40">SHA7</a> + <a href="/diffs/commit/SHA40">SHA7</a> · diff against the first parent</dd>
113<dt>signature</dt>
114<dd>
115<span class="pill sig sig-none" title="This commit is not signed">unsigned</span>
116</dd>
117</dl>
118</header>
119<div class="diff-tools" role="group" aria-label="Diff view">
120<span class="dim">1 file · <span class="plus">+1</span>
121<span class="minus">-0</span>
122</span>
123<span class="grow">
124</span>
125<details class="menu vmenu">
126<summary class="btn" aria-label="Diff view">
127<span hx-live="this.textContent = q('#diffs').attr['data-mobile'] !== 'true' && q('#diffs').attr['data-diff'] === 'split' ? 'Split' : 'Unified'">Unified</span>
128</summary>
129<div class="menu-pop" role="group" aria-label="Diff view">
130<a href="/diffs/commit/SHA40?view=unified" class="btn vbtn" data-view="unified" aria-keyshortcuts="u" aria-current="true" data-fire="unified" :aria-current="(q('#diffs').attr['data-mobile'] === 'true' ? 'unified' : q('#diffs').attr['data-diff']) === this.dataset.view ? 'true' : false">Unified<kbd aria-hidden="true">u</kbd>
131</a>
132<a href="/diffs/commit/SHA40?view=split" class="btn vbtn" data-view="split" aria-keyshortcuts="d" :aria-disabled="q('#diffs').attr['data-mobile'] === 'true' ? 'true' : false" :title="q('#diffs').attr['data-mobile'] === 'true' ? 'Split view requires a wider screen' : 'Split view'" data-fire="split" :aria-current="(q('#diffs').attr['data-mobile'] === 'true' ? 'unified' : q('#diffs').attr['data-diff']) === this.dataset.view ? 'true' : false">Split<kbd aria-hidden="true">d</kbd>
133</a>
134<button type="button" aria-keyshortcuts="x" data-js data-fire="collapse" class="btn">
135<span hx-live="this.textContent = q('[data-file][open]').count || !q('[data-file]').count ? 'Collapse all' : 'Expand all'">Collapse all</span>
136<kbd aria-hidden="true">x</kbd>
137</button>
138</div>
139</details>
140</div>
141<div id="diffs" data-diff="unified" hx-live="this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff">
142<details class="dfile lnw-2" id="f1" data-file="side.txt" open>
143<summary>
144<span class="st">A</span>
145<span class="p">side.txt</span>
146<span class="plus">+1</span>
147<span class="minus">-0</span>
148</summary>
149<div class="dscroll">
150<table class="dt uni" aria-label="side.txt, unified">
151<tbody>
152<tr class="hunk">
153<td colspan="4">@@ -0,0 +1,1 @@</td>
154</tr>
155<tr class="add">
156<td class="ln">
157</td>
158<td class="ln">1</td>
159<td class="m">+</td>
160<td class="tx chroma">from the side</td>
161</tr>
162</tbody>
163</table>
164<table class="dt spl" aria-label="side.txt, split">
165<colgroup>
166<col class="c-ln">
167<col class="c-m">
168<col>
169<col class="c-ln">
170<col class="c-m">
171<col>
172</colgroup>
173<tbody>
174<tr class="hunk">
175<td colspan="6">@@ -0,0 +1,1 @@</td>
176</tr>
177<tr>
178<td class="ln none">
179</td>
180<td class="m none">
181</td>
182<td class="tx none">
183</td>
184<td class="ln add">1</td>
185<td class="m add">+</td>
186<td class="tx chroma add">from the side</td>
187</tr>
188</tbody>
189</table>
190</div>
191</details>
192</div>
193</main>
194<aside class="rail" aria-label="Context">
195<section aria-labelledby="r-files">
196<h2 id="r-files">Files <span class="count">1</span>
197</h2>
198<ol class="files" aria-label="Changed files">
199<li>
200<a href="#f1" title="side.txt" hx-on:click="(window.ermiteMR?.openFile || ermite.openFile)(this.hash.slice(1))">
201<span class="st" data-st="A" title="added">A</span>
202<span class="nm">
203<span class="p">side.txt</span>
204<span class="d">
205<bdi>
206</bdi>
207</span>
208</span>
209<span class="n">
210<span class="plus">+1</span>
211<span class="minus">-0</span>
212</span>
213</a>
214</li>
215</ol>
216</section>
217</aside>
218</div>
219<footer class="foot">
220<span>ermite devel</span>
221<a href="http://example.test/ermite" rel="noopener" title="source of this version (AGPL-3.0-or-later)">source</a>
222<button type="button" class="foot-keys" data-js data-fire="help" aria-haspopup="dialog" aria-controls="panel-help" aria-keyshortcuts="?">
223<kbd aria-hidden="true">?</kbd> keyboard shortcuts</button>
224</footer>
225<div class="hint" role="status" aria-live="polite">
226<span class="hint-nav" :text="document.body.dataset.nav || ''">
227</span>
228<span class="hint-sel" :text="document.body.dataset.sel ? document.body.dataset.sel + ' · y permalink' : ''">
229</span>
230<span class="hint-flash" :text="document.body.dataset.flash || ''">
231</span>
232</div>
233<dialog id="panel-help" class="panel modal" aria-label="Keyboard shortcuts" hx-on:keydown="event.key === 'Escape' && (event.preventDefault(), this.close())" hx-on:click="event.target === this && this.close()">
234<div class="panel-head">
235<h2>Keyboard shortcuts</h2>
236<button type="button" class="panel-x" aria-label="Close" hx-on:click="closest('dialog').close()">
237<kbd>esc</kbd> close</button>
238</div>
239<div class="keys-pref">
240<label>
241<input type="checkbox" id="keys-off" aria-describedby="keys-note" hx-on:change="ermite.setKeysOff(this.checked)"> Turn off single-key shortcuts</label>
242<p id="keys-note" class="dim">Single-key shortcuts are on. ctrl k and esc work whatever this says.</p>
243</div>
244<dl class="keys">
245<div>
246<dt>
247<kbd>ctrl k</kbd>
248<kbd>:</kbd>
249</dt>
250<dd>go to a section, branch, tag, file or repository</dd>
251</div>
252<div>
253<dt>
254<kbd>?</kbd>
255</dt>
256<dd>this list</dd>
257</div>
258<div>
259<dt>
260<kbd>j</kbd>
261<kbd>k</kbd>
262</dt>
263<dd>move the row cursor down / up</dd>
264</div>
265<div>
266<dt>
267<kbd>enter</kbd>
268</dt>
269<dd>open the row under the cursor; on Files, a directory opens or closes in place</dd>
270</div>
271<div>
272<dt>
273<kbd>↑</kbd>
274<kbd>↓</kbd>
275<kbd>←</kbd>
276<kbd>→</kbd>
277<kbd>home</kbd>
278<kbd>end</kbd>
279</dt>
280<dd>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</dd>
281</div>
282<div>
283<dt>
284<kbd>l</kbd>
285<kbd>h</kbd>
286</dt>
287<dd>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</dd>
288</div>
289<div>
290<dt>
291<kbd>g g</kbd>
292<kbd>G</kbd>
293</dt>
294<dd>first / last row</dd>
295</div>
296<div>
297<dt>
298<kbd>/</kbd>
299</dt>
300<dd>filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)</dd>
301</div>
302<div>
303<dt>
304<kbd>b</kbd>
305</dt>
306<dd>switch branch or tag</dd>
307</div>
308<div>
309<dt>
310<kbd>s</kbd>
311<kbd>t</kbd>
312<kbd>c</kbd>
313<kbd>r</kbd>
314<kbd>m</kbd>
315<kbd>i</kbd>
316</dt>
317<dd>tabs: summary, files, commits, branches & tags, merge requests, issues</dd>
318</div>
319<div>
320<dt>
321<kbd>g h</kbd>
322</dt>
323<dd>home</dd>
324</div>
325<div>
326<dt>
327<kbd>w</kbd>
328</dt>
329<dd>wide mode: use the whole width of the screen, or not (remembered)</dd>
330</div>
331<div>
332<dt>
333<kbd>y</kbd>
334</dt>
335<dd>copy a permalink pinned to the commit</dd>
336</div>
337<div>
338<dt>
339<kbd>d</kbd>
340<kbd>u</kbd>
341<kbd>x</kbd>
342</dt>
343<dd>diff: split / unified / collapse or expand all</dd>
344</div>
345<div>
346<dt>
347<kbd>e</kbd>
348<kbd>E</kbd>
349</dt>
350<dd>diff: the whole file in view / every file, with the lines the hunks hide</dd>
351</div>
352<div>
353<dt>
354<kbd>n</kbd>
355</dt>
356<dd>merge request: next note in the diff</dd>
357</div>
358<div>
359<dt>
360<kbd>esc</kbd>
361</dt>
362<dd>close a dialog, leave a field</dd>
363</div>
364</dl>
365</dialog>
366<dialog id="panel-refs" class="panel modal" aria-label="Switch ref" hx-on:keydown="event.key === 'Escape' && (event.preventDefault(), this.close())" hx-on:click="event.target === this && this.close()">
367<div class="panel-head">
368<label for="refs-filter" class="sr">filter branches and tags</label>
369<input id="refs-filter" type="search" placeholder="Switch branch or tag…" autocomplete="off" data-pick="#panel-refs li" hx-on:input="ermite.filter(this)">
370<button type="button" class="panel-x" aria-label="Close" hx-on:click="closest('dialog').close()">
371<kbd>esc</kbd>
372</button>
373</div>
374<div class="panel-cols" data-picklist>
375<section aria-label="Branches">
376<h2>Branches <span class="count">2</span>
377</h2>
378<ul>
379<li>
380<a href="/diffs/tree/main">
381<span class="mark" aria-hidden="true"> </span>main</a>
382</li>
383<li>
384<a href="/diffs/tree/side">
385<span class="mark" aria-hidden="true"> </span>side</a>
386</li>
387</ul>
388</section>
389<section aria-label="Tags">
390<h2>Tags <span class="count">1</span>
391</h2>
392<ul>
393<li>
394<a href="/diffs/tree/v1.0.0">
395<span class="mark" aria-hidden="true"> </span>v1.0.0</a>
396</li>
397</ul>
398</section>
399</div>
400</dialog>
401<dialog id="panel-cmd" class="panel modal" aria-label="Go to" hx-on:close="ermiteFinder.paletteClose()" hx-on:keydown="event.key === 'Escape' && (event.preventDefault(), this.close())" hx-on:click="event.target === this && this.close()">
402<div class="panel-head">
403<label for="cmd-q" class="sr">go to</label>
404<input id="cmd-q" type="search" placeholder="Go to a section, branch, tag, file or repository…" autocomplete="off" spellcheck="false" role="combobox" aria-autocomplete="list" aria-expanded="true" aria-controls="cmd-list" aria-activedescendant="cmd-o0" hx-on:input="ermite.cmdFilter(this); ermiteFinder.palette(this)" hx-on:keydown="ermite.cmdKey(event)">
405<button type="button" class="panel-x" aria-label="Close" hx-on:click="closest('dialog').close()">
406<kbd>esc</kbd>
407</button>
408</div>
409<ul id="cmd-list" class="cmd-list" role="listbox" aria-label="Targets">
410<li id="cmd-o0" role="option" aria-selected="true" data-k="go home" data-cursor>
411<a href="/" tabindex="-1">
412<span class="lbl">home</span>
413<span class="k">go</span>
414</a>
415</li>
416<li id="cmd-o1" role="option" aria-selected="false" data-k="section summary">
417<a href="/diffs" tabindex="-1">
418<span class="lbl">summary</span>
419<span class="k">section</span>
420</a>
421</li>
422<li id="cmd-o2" role="option" aria-selected="false" data-k="section files">
423<a href="/diffs/tree/main" tabindex="-1">
424<span class="lbl">files</span>
425<span class="k">section</span>
426</a>
427</li>
428<li id="cmd-o3" role="option" aria-selected="false" data-k="section commits">
429<a href="/diffs/commits/main" tabindex="-1">
430<span class="lbl">commits</span>
431<span class="k">section</span>
432</a>
433</li>
434<li id="cmd-o4" role="option" aria-selected="false" data-k="section branches & tags">
435<a href="/diffs/refs" tabindex="-1">
436<span class="lbl">branches & tags</span>
437<span class="k">section</span>
438</a>
439</li>
440<li id="cmd-o5" role="option" aria-selected="false" data-k="section merge requests">
441<a href="/diffs/merge-requests" tabindex="-1">
442<span class="lbl">merge requests</span>
443<span class="k">section</span>
444</a>
445</li>
446<li id="cmd-o6" role="option" aria-selected="false" data-k="section actions">
447<a href="/diffs/actions" tabindex="-1">
448<span class="lbl">actions</span>
449<span class="k">section</span>
450</a>
451</li>
452<li id="cmd-o7" role="option" aria-selected="false" data-k="branch main">
453<a href="/diffs/tree/main" tabindex="-1">
454<span class="lbl">main</span>
455<span class="k">branch</span>
456</a>
457</li>
458<li id="cmd-o8" role="option" aria-selected="false" data-k="branch side">
459<a href="/diffs/tree/side" tabindex="-1">
460<span class="lbl">side</span>
461<span class="k">branch</span>
462</a>
463</li>
464<li id="cmd-o9" role="option" aria-selected="false" data-k="tag v1.0.0">
465<a href="/diffs/tree/v1.0.0" tabindex="-1">
466<span class="lbl">v1.0.0</span>
467<span class="k">tag</span>
468</a>
469</li>
470<li id="cmd-o10" role="option" aria-selected="false" data-k="action turn single-key shortcuts on off keyboard">
471<a href="#" data-fire="keys" tabindex="-1">
472<span class="lbl">turn single-key shortcuts off</span>
473<span class="k">action</span>
474</a>
475</li>
476</ul>
477<p class="panel-foot">
478<span>
479<kbd>↑</kbd>
480<kbd>↓</kbd> move</span>
481<span>
482<kbd>enter</kbd> open</span>
483<span>
484<kbd>esc</kbd> close</span>
485</p>
486</dialog>
487<div id="keys" hidden hx-on="k-j from:body -> ermite.move(1);
488 k-k from:body -> ermite.move(-1);
489 k-top from:body -> ermite.edge(false);
490 k-bottom from:body -> ermite.edge(true);
491 k-open from:body -> ermite.open();
492 k-right from:body -> ermite.rail(true);
493 k-left from:body -> ermite.rail(false);
494 k-esc from:body -> ermite.closeDialogs();
495 k-help from:body -> ermite.dialog('panel-help');
496 k-refs from:body -> ermite.dialog('panel-refs', 'refs-filter');
497 k-cmd from:body -> ermite.dialog('panel-cmd', 'cmd-q'); ermiteFinder.load();
498 k-filter from:body -> ermite.focusFilter();
499 k-gh from:body -> ermite.go('.brand');
500 k-s from:body -> ermite.tab('s');
501 k-t from:body -> ermite.tab('t');
502 k-c from:body -> ermite.tab('c');
503 k-r from:body -> ermite.tab('r');
504 k-m from:body -> ermite.tab('m');
505 k-i from:body -> ermite.tab('i');
506 k-next from:body -> ermite.nextNote();
507 k-split from:body -> ermite.layout('split');
508 k-unified from:body -> ermite.layout('unified');
509 k-collapse from:body -> ermite.collapse();
510 k-wide from:body -> window.ermiteWide.toggle();
511 k-expand from:body -> ermite.expandFile();
512 k-expandAll from:body -> ermite.expandAll();
513 k-permalink from:body -> ermite.permalink();
514 k-merge from:body -> window.ermiteMR?.openMerge();
515 k-read from:body -> window.ermiteMR?.markRead();
516 k-gf from:body -> window.ermiteMR?.focusFiles();
517 k-keys from:body -> ermite.toggleKeys()">
518</div>
519</body>
520</html>