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