Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-15 18:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change checkout branch name from "master" to ${pullreq.branch}

Browse Source
This commit is contained in:
bati11
2015-01-20 23:23:40 +09:00
parent 135e1ef73d
commit f1ac2b3507
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/pulls/mergeguide.scala.html
View File

@@ -62,7 +62,7 @@
<p> <p>
<span class="strong">Step 3:</span> Merge the changes and update the server <span class="strong">Step 3:</span> Merge the changes and update the server
</p> </p>
@defining(s"git checkout master\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command => @defining(s"git checkout ${pullreq.branch}\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
@helper.html.copy("merge-command-copy-3", command){ @helper.html.copy("merge-command-copy-3", command){
<pre style="width: 500px; float: left;">@command</pre> <pre style="width: 500px; float: left;">@command</pre>
} }