From 622ccd4654654cacaa7b3728a82fd5cb8e13686c Mon Sep 17 00:00:00 2001
From: Robert Wolff <mahlzahn@posteo.de>
Date: Wed, 31 Jul 2024 11:36:46 +0200
Subject: [PATCH] fix(UI): missing rebase command line instructions for rebase
 ff-only

---
 templates/repo/issue/view_content/pull_merge_instruction.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
index e89102802a..62605ad730 100644
--- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl
+++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
@@ -22,6 +22,8 @@
 			<div>git merge --no-ff {{$localBranch}}</div>
 		</div>
 		<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 merge --ff-only {{$localBranch}}</div>
 		</div>