Permalink
Browse files

can merge branches now - may not be too safe yet

  • Loading branch information...
1 parent 3ff5857 commit 07441fab20dc5ea13aeb986ed8aa89e5b18e6776 @schacon schacon committed Mar 7, 2008
Showing with 6 additions and 0 deletions.
  1. +5 −0 git-wiki.rb
  2. +1 −0 views/branches.erb
View
@@ -112,6 +112,11 @@ def touchfile
redirect '/' + HOMEPAGE
end
+get '/a/merge_branch/:branch' do
+ $repo.merge(params[:branch])
+ redirect '/a/branches'
+end
+
get '/a/delete_branch/:branch' do
$repo.branch(params[:branch]).delete
redirect '/a/branches'
View
@@ -9,6 +9,7 @@
<% else %>
<td><%= b.name %></td>
<td><a href="/a/branch/<%= b.name %>">switch</a></td>
+ <td><a href="/a/merge_branch/<%= b.name %>">merge</a></td>
<!-- <td><a href="/a/delete_branch/<%= b.name %>">delete</a></td> -->
<% end %>
</tr>

0 comments on commit 07441fa

Please sign in to comment.