summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authortechknowlogick <techknowlogick@gitea.io>2020-06-17 16:53:55 -0400
committerGitHub <noreply@github.com>2020-06-17 16:53:55 -0400
commit6bf78d2b576a5caa77a670db9bbf2572d0272f25 (patch)
tree36b547e948ac0c1aed41c5088f397ea50fa905ee /templates
parent9e6a79bea9d7911c81b86a6d3715d340fc19032a (diff)
downloadgitea-6bf78d2b576a5caa77a670db9bbf2572d0272f25.tar.gz
gitea-6bf78d2b576a5caa77a670db9bbf2572d0272f25.zip
Global default branch setting (#11918)
* Global default branch setting * add to app.ini example per @silverwind * update per @lunny Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/repo/create.tmpl2
-rw-r--r--templates/repo/empty.tmpl3
2 files changed, 3 insertions, 2 deletions
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index cad60126ef..c4b25c73d8 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -165,7 +165,7 @@
</div>
<div class="inline field">
<label for="default_branch">{{.i18n.Tr "repo.default_branch"}}</label>
- <input id="default_branch" name="default_branch" value="{{.default_branch}}" placeholder="master">
+ <input id="default_branch" name="default_branch" value="{{.default_branch}}" placeholder="{{.default_branch}}">
</div>
</div>
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index 8efb6d2866..9aa0706c29 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -49,10 +49,11 @@
<div class="markdown">
<pre><code>touch README.md
git init
+{{if ne .Repository.DefaultBranch "master"}}git branch -m master {{.Repository.DefaultBranch}}{{end}}
git add README.md
git commit -m "first commit"
git remote add origin <span class="clone-url">{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}</span>
-git push -u origin {{if ne .Repository.DefaultBranch "master"}}master:{{.Repository.DefaultBranch}}{{else}}master{{end}}</code></pre>
+git push -u origin {{.Repository.DefaultBranch}}</code></pre>
</div>
</div>
<div class="ui divider"></div>