From b1ed092488d1b992af519b8a96d279ffa064f50a Mon Sep 17 00:00:00 2001
From: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
Date: Fri, 16 Jul 2010 11:39:04 +0530
Subject: [PATCH] gitweb: Add git_merge sub

It is used to merge 2 commits.

Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
---
 gitweb/gitweb.perl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 53e316f60b..ebcf45aff2 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3462,6 +3462,12 @@ sub git_branch_move {
 		or die_error(500,"Open git-branch failed");
 }
 
+sub git_merge {
+	open my $fd, "-|", git_cmd(), "merge"
+		param('first_branch'), param('second_branch')
+		or die_error(500,"Open git-merge failed");
+}
+
 #	git_header_html();
 #	git_print_page_nav();
 #	git_print_header_div('status',$project);
-- 
2.11.4.GIT