]> source.dussan.org Git - gitblit.git/commit
projects / gitblit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5c44219) | patch
Add merge type setting to repository page. 1142/head merged--merge-strategy
authorFlorian Zschocke <florian.zschocke@cycos.com>
Mon, 23 Jun 2014 02:12:19 +0000 (04:12 +0200)
committerFlorian Zschocke <florian.zschocke@devolo.de>
Fri, 28 Oct 2016 09:02:25 +0000 (11:02 +0200)
commit355cbb8f10527032e9c9cedbef5b68f118418d68
treee0f6dea7a7ceb7a4f5c9d2ef69082430e6ca7932tree | snapshot
parent5c44219084e825feea72c60a83bc6889e3cf1bc9commit | diff
Add merge type setting to repository page.

The merge type is a per repository setting. Add it to the edit page.
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties diff | blob | history
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html diff | blob | history
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java diff | blob | history
Pure java git solution: https://github.com/gitblit-org/gitblit