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