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