patchii/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(UI): missing rebase command line instructions for rebase ff-only

Browse source
This commit is contained in:
Robert Wolff 2024-07-31 11:36:46 +02:00
parent 4de909747b
commit 622ccd4654
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/repo/issue/view_content/pull_merge_instruction.tmpl
View file

@ -22,6 +22,8 @@
<div>git merge --no-ff {{$localBranch}}</div> <div>git merge --no-ff {{$localBranch}}</div>
</div> </div>
<div class="tw-hidden" data-pull-merge-style="rebase"> <div class="tw-hidden" data-pull-merge-style="rebase">
<div>git checkout {{$localBranch}}</div>
<div>git rebase {{.PullRequest.BaseBranch}}</div>
<div>git checkout {{.PullRequest.BaseBranch}}</div> <div>git checkout {{.PullRequest.BaseBranch}}</div>
<div>git merge --ff-only {{$localBranch}}</div> <div>git merge --ff-only {{$localBranch}}</div>
</div> </div>