From d3b1e34c7428fbe4ef3abeee9eaef0f885c3f19b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 14 Apr 2014 12:31:56 -0400
Subject: [PATCH] Merged #47 "Fix diffstat display for tickets with pending submodule changes"
---
src/site/administration.mkd | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/site/administration.mkd b/src/site/administration.mkd
index 7ed40eb..6fc334e 100644
--- a/src/site/administration.mkd
+++ b/src/site/administration.mkd
@@ -94,22 +94,22 @@
**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.
-<pre>
+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"]
displayName = Bob Jones
emailAddress = bob@somewhere.com
-</pre>
-<pre>
+```
+
git config user.name "Bob Jones"
git config user.email bob@somewhere.com
-</pre>
or
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.
@@ -119,7 +119,7 @@
#### Reflog
-Gitblit v1.2.1 introduced an incomplete reflog mechanism which was completed in 1.3.0. All pushes to Gitblit are automatically logged on an orphan branch, refs/gitblit/reflog. If this ref exists, the reflog page link will be displayed on the repository pages.
+Gitblit v1.2.1 introduced an incomplete reflog mechanism which was completed in 1.3.0. All pushes to Gitblit are automatically logged on an orphan branch, `refs/meta/gitblit/reflog`. If this ref exists, the reflog page link will be displayed on the repository pages.
This reflog is similar to, but not the same as, the normal Git reflog. The Gitblit reflog links Gitblit accounts to ref changes and because it is stored on an orphan branch, the reflog is portable by the federation mechanism or by a normal <code>git clone --mirror</code> command.
--
Gitblit v1.9.1