From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/main/java/com/gitblit/wicket/pages/propose_git.md | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/propose_git.md b/src/main/java/com/gitblit/wicket/pages/propose_git.md
index 1b4f429..4589bf8 100644
--- a/src/main/java/com/gitblit/wicket/pages/propose_git.md
+++ b/src/main/java/com/gitblit/wicket/pages/propose_git.md
@@ -2,5 +2,5 @@
cd ${repo}
git checkout -b ${reviewBranch} ${integrationBranch}
...
- git push origin HEAD:refs/for/${ticketId}
- git branch --set-upstream-to=origin/${reviewBranch}
+ git push --up-stream origin ${reviewBranch}
+
--
Gitblit v1.9.1