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