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<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="toolbar" 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" 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" hx-on:click="document.getElementById(this.hash.slice(1)).open = true">
186<span class="st" title="A">A</span>
187<span class="p" title="side.txt">side.txt</span>
188<span class="n">
189<span class="plus">+1</span>
190<span class="minus">-0</span>
191</span>
192<span class="b" aria-hidden="true">
193<span class="plus">++++++++++</span>
194<span class="minus">
195</span>
196</span>
197</a>
198</li>
199</ol>
200</section>
201</aside>
202</div>
203<footer class="foot">
204<span>ermite devel</span>
205<a href="http://example.test/ermite" rel="noopener" title="source of this version (AGPL-3.0-or-later)">source</a>
206<button type="button" class="foot-keys" data-js data-fire="help" aria-haspopup="dialog" aria-controls="panel-help" aria-keyshortcuts="?">
207<kbd aria-hidden="true">?</kbd> keyboard shortcuts</button>
208</footer>
209<div class="hint" role="status" aria-live="polite">
210<span class="hint-nav" :text="document.body.dataset.nav || ''">
211</span>
212<span class="hint-sel" :text="document.body.dataset.sel ? document.body.dataset.sel + ' · y permalink' : ''">
213</span>
214<span class="hint-flash" :text="document.body.dataset.flash || ''">
215</span>
216</div>
217<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()">
218<div class="panel-head">
219<h2>Keyboard shortcuts</h2>
220<button type="button" class="panel-x" aria-label="Close" hx-on:click="closest('dialog').close()">
221<kbd>esc</kbd> close</button>
222</div>
223<dl class="keys">
224<div>
225<dt>
226<kbd>ctrl k</kbd>
227<kbd>:</kbd>
228</dt>
229<dd>go to a section, branch, tag, file or repository</dd>
230</div>
231<div>
232<dt>
233<kbd>?</kbd>
234</dt>
235<dd>this list</dd>
236</div>
237<div>
238<dt>
239<kbd>j</kbd>
240<kbd>k</kbd>
241</dt>
242<dd>move the row cursor down / up</dd>
243</div>
244<div>
245<dt>
246<kbd>enter</kbd>
247</dt>
248<dd>open the row under the cursor</dd>
249</div>
250<div>
251<dt>
252<kbd>g g</kbd>
253<kbd>G</kbd>
254</dt>
255<dd>first / last row</dd>
256</div>
257<div>
258<dt>
259<kbd>/</kbd>
260</dt>
261<dd>filter the list; on Files, find a file in the repository</dd>
262</div>
263<div>
264<dt>
265<kbd>b</kbd>
266</dt>
267<dd>switch branch or tag</dd>
268</div>
269<div>
270<dt>
271<kbd>s</kbd>
272<kbd>t</kbd>
273<kbd>c</kbd>
274<kbd>r</kbd>
275<kbd>m</kbd>
276</dt>
277<dd>tabs: summary, files, commits, branches & tags, merge requests</dd>
278</div>
279<div>
280<dt>
281<kbd>g h</kbd>
282</dt>
283<dd>home</dd>
284</div>
285<div>
286<dt>
287<kbd>y</kbd>
288</dt>
289<dd>copy a permalink pinned to the commit</dd>
290</div>
291<div>
292<dt>
293<kbd>d</kbd>
294<kbd>u</kbd>
295<kbd>x</kbd>
296</dt>
297<dd>diff: split / unified / collapse or expand all</dd>
298</div>
299<div>
300<dt>
301<kbd>n</kbd>
302</dt>
303<dd>merge request: next note in the diff</dd>
304</div>
305<div>
306<dt>
307<kbd>esc</kbd>
308</dt>
309<dd>close a dialog, leave a field</dd>
310</div>
311</dl>
312</dialog>
313<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()">
314<div class="panel-head">
315<label for="refs-filter" class="sr">filter branches and tags</label>
316<input id="refs-filter" type="search" placeholder="Switch branch or tag…" autocomplete="off" data-pick="#panel-refs li" hx-on:input="ermite.filter(this)">
317<button type="button" class="panel-x" aria-label="Close" hx-on:click="closest('dialog').close()">
318<kbd>esc</kbd>
319</button>
320</div>
321<div class="panel-cols" data-picklist>
322<section aria-label="Branches">
323<h2>Branches <span class="count">2</span>
324</h2>
325<ul>
326<li>
327<a href="/diffs/tree/main">
328<span class="mark" aria-hidden="true"> </span>main</a>
329</li>
330<li>
331<a href="/diffs/tree/side">
332<span class="mark" aria-hidden="true"> </span>side</a>
333</li>
334</ul>
335</section>
336<section aria-label="Tags">
337<h2>Tags <span class="count">1</span>
338</h2>
339<ul>
340<li>
341<a href="/diffs/tree/v1.0.0">
342<span class="mark" aria-hidden="true"> </span>v1.0.0</a>
343</li>
344</ul>
345</section>
346</div>
347</dialog>
348<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()">
349<div class="panel-head">
350<label for="cmd-q" class="sr">go to</label>
351<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)">
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<ul id="cmd-list" class="cmd-list" aria-label="Targets">
357<li data-k="go home" data-cursor>
358<a href="/" tabindex="-1">
359<span class="lbl">home</span>
360<span class="k">go</span>
361</a>
362</li>
363<li data-k="section summary">
364<a href="/diffs" tabindex="-1">
365<span class="lbl">summary</span>
366<span class="k">section</span>
367</a>
368</li>
369<li data-k="section files">
370<a href="/diffs/tree/main" tabindex="-1">
371<span class="lbl">files</span>
372<span class="k">section</span>
373</a>
374</li>
375<li data-k="section commits">
376<a href="/diffs/commits/main" tabindex="-1">
377<span class="lbl">commits</span>
378<span class="k">section</span>
379</a>
380</li>
381<li data-k="section branches & tags">
382<a href="/diffs/refs" tabindex="-1">
383<span class="lbl">branches & tags</span>
384<span class="k">section</span>
385</a>
386</li>
387<li data-k="section merge requests">
388<a href="/diffs/merge-requests" tabindex="-1">
389<span class="lbl">merge requests</span>
390<span class="k">section</span>
391</a>
392</li>
393<li data-k="section actions">
394<a href="/diffs/actions" tabindex="-1">
395<span class="lbl">actions</span>
396<span class="k">section</span>
397</a>
398</li>
399<li data-k="branch main">
400<a href="/diffs/tree/main" tabindex="-1">
401<span class="lbl">main</span>
402<span class="k">branch</span>
403</a>
404</li>
405<li data-k="branch side">
406<a href="/diffs/tree/side" tabindex="-1">
407<span class="lbl">side</span>
408<span class="k">branch</span>
409</a>
410</li>
411<li data-k="tag v1.0.0">
412<a href="/diffs/tree/v1.0.0" tabindex="-1">
413<span class="lbl">v1.0.0</span>
414<span class="k">tag</span>
415</a>
416</li>
417</ul>
418<p class="panel-foot">
419<span>
420<kbd>↑</kbd>
421<kbd>↓</kbd> move</span>
422<span>
423<kbd>enter</kbd> open</span>
424<span>
425<kbd>esc</kbd> close</span>
426</p>
427</dialog>
428<div id="keys" hidden hx-on="k-j from:body -> ermite.move(1);
429 k-k from:body -> ermite.move(-1);
430 k-top from:body -> ermite.edge(false);
431 k-bottom from:body -> ermite.edge(true);
432 k-open from:body -> ermite.open();
433 k-esc from:body -> ermite.closeDialogs();
434 k-help from:body -> ermite.dialog('panel-help');
435 k-refs from:body -> ermite.dialog('panel-refs', 'refs-filter');
436 k-cmd from:body -> ermite.dialog('panel-cmd', 'cmd-q'); ermiteFinder.load();
437 k-filter from:body -> ermite.focusFilter();
438 k-gh from:body -> ermite.go('.brand');
439 k-s from:body -> ermite.tab('s');
440 k-t from:body -> ermite.tab('t');
441 k-c from:body -> ermite.tab('c');
442 k-r from:body -> ermite.tab('r');
443 k-m from:body -> ermite.tab('m');
444 k-next from:body -> ermite.nextNote();
445 k-split from:body -> ermite.layout('split');
446 k-unified from:body -> ermite.layout('unified');
447 k-collapse from:body -> ermite.collapse();
448 k-permalink from:body -> ermite.permalink()">
449</div>
450</body>
451</html>