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