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