Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
yanxd 2013-12-11 14:52:59 +08:00
commit fb64b47ba6
1 changed files with 6 additions and 7 deletions

View File

@ -21,23 +21,22 @@
:id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil}, :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil},
:class => 'repository' + (repo == @repository ? ' selected' : '') :class => 'repository' + (repo == @repository ? ' selected' : '')
}.join('&nbsp|&nbsp').html_safe %>)</p> }.join('&nbsp|&nbsp').html_safe %>)</p>
<% end %> <% else %>
</h3> <h3>建立版本库文件夹,打开命令行执行如下:</h3>
<% if @repository.branches.empty?%>
<h3>建立版本库文件夹,打开命令行执行如下:</h3>
<div class="repos_explain"> <div class="repos_explain">
<p>git init</p> <p>git init</p>
<p>git add *</p> <p>git add *</p>
<p>git commit -m "first commit"</p> <p>git commit -m "first commit"</p>
<p>git remote add origin <%= @repos_url%></p> <p>git remote add origin <%= @repos_url%></p>
<p>git push -u origin master</p> <p>git push -u origin master:master</p>
</div> </div>
<h3>已经有本地库,打开命令行执行如下:</h3> <h3>已经有本地库,打开命令行执行如下:</h3>
<div class="repos_explain"> <div class="repos_explain">
<p>git remote add origin <%= @repos_url%></p> <p>git remote add origin <%= @repos_url%></p>
<p>git push -u origin master</p> <p>git push -u origin master:matser</p>
</div> </div>
<% end %> <% end %>
</h3>
<% if !@entries.nil? && authorize_for('repositories', 'browse') %> <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
<%= render :partial => 'dir_list' %> <%= render :partial => 'dir_list' %>
<% end %> <% end %>