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/site/administration.mkd | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/site/administration.mkd b/src/site/administration.mkd
index dad4f41..1a5aca1 100644
--- a/src/site/administration.mkd
+++ b/src/site/administration.mkd
@@ -94,7 +94,7 @@
**How is this enforced?**
-Bob must set his *user.name* and *user.email* values for the repository to match his Gitblit user account **BEFORE** committing to his repository.
+Bob must properly set his *user.name* and *user.email* values for the repository to match his Gitblit user account **BEFORE** committing to his repository.
```
[user "bob"]
@@ -109,7 +109,7 @@
git config user.name bob
git config user.email bob@somewhere.com
-If the Gitblit account does not specify an email address, then the committer email address is ignored. However, if the account does specify an address it must match the committer's email address. Display name or username can be used as the committer name.
+The committer email address is required to be identical. Display name or username can be used as the committer name.
All checks are case-insensitive.
--
Gitblit v1.9.1