loading up the forgejo repo on tangled to test page performance
Merge pull request 'fix(UI): missing rebase command line instructions for rebase ff-only' (#4758) from mahlzahn/forgejo:fix_command_line_instructions_rebase_ff_only into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4758
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
+2
+2
templates/repo/issue/view_content/pull_merge_instruction.tmpl
+2
templates/repo/issue/view_content/pull_merge_instruction.tmpl
···
22
22
<div>git merge --no-ff {{$localBranch}}</div>
23
23
</div>
24
24
<div class="tw-hidden" data-pull-merge-style="rebase">
25
+
<div>git checkout {{$localBranch}}</div>
26
+
<div>git rebase {{.PullRequest.BaseBranch}}</div>
25
27
<div>git checkout {{.PullRequest.BaseBranch}}</div>
26
28
<div>git merge --ff-only {{$localBranch}}</div>
27
29
</div>