summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorFlorian Zschocke <florian.zschocke@cycos.com>2014-06-23 04:12:19 +0200
committerFlorian Zschocke <florian.zschocke@devolo.de>2016-10-28 11:02:25 +0200
commit355cbb8f10527032e9c9cedbef5b68f118418d68 (patch)
treee0f6dea7a7ceb7a4f5c9d2ef69082430e6ca7932 /.mailmap
parent5c44219084e825feea72c60a83bc6889e3cf1bc9 (diff)
downloadgitblit-merged--merge-strategy.tar.gz
gitblit-merged--merge-strategy.zip
Add merge type setting to repository page.merged--merge-strategy
The merge type is a per repository setting. Add it to the edit page.
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions