From b083f5a956e69715efaaf95b810b02dec687c82e Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 26 Sep 2011 22:57:31 -0400 Subject: [PATCH] Documentation. --- distrib/federation.properties | 22 ++++++++++++++++++---- distrib/gitblit.properties | 7 +++++++ docs/04_releases.mkd | 6 +++--- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/distrib/federation.properties b/distrib/federation.properties index e7e17f7c..c762b45c 100644 --- a/distrib/federation.properties +++ b/distrib/federation.properties @@ -37,12 +37,26 @@ federation.name = # The shortest frequency allowed is every 5 minutes # Decimal frequency values are cast to integers # Frequency values may be specified in mins, hours, or days -# Values that can not be parsed default to *federation.defaultFrequency* +# Values that can not be parsed or are unspecified default to *federation.defaultFrequency* # # folder: -# if blank, the folder is *git.repositoriesFolder* +# if unspecified, the folder is *git.repositoriesFolder* # if specified, the folder is relative to *git.repositoriesFolder* # +# bare: +# if true, each repository will be created as a *bare* repository and will not +# have a working directory. +# +# if false, each repository will be created as a normal repository suitable +# for local work. +# +# mirror: +# if true, each repository HEAD is reset to *origin/master* after each pull. +# The repository will be flagged *isFrozen* after the initial clone. +# +# if false, each repository HEAD will point to the FETCH_HEAD of the initial +# clone from the origin until pushed to or otherwise manipulated. +# # mergeAccounts: # if true, remote accounts and their permissions are merged into your # users.properties file @@ -52,7 +66,7 @@ federation.name = # notified by email of pull failures # # include and exclude: -# space-separated list of repositories to include or exclude from pull +# Space-delimited list of repositories to include or exclude from pull # may be * wildcard to include or exclude all # may use fuzzy match (e.g. org.eclipse.*) @@ -64,6 +78,6 @@ federation.name = #federation.example1.token = 6f3b8a24bf970f17289b234284c94f43eb42f0e4 #federation.example1.frequency = 120 mins #federation.example1.folder = -#federation.example1.bare = true +#federation.example1.bare = true #federation.example1.mirror = true #federation.example1.mergeAccounts = true diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index e8acfa93..5493b25b 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -391,6 +391,13 @@ federation.sets = # if unspecified, the folder is *git.repositoriesFolder* # if specified, the folder is relative to *git.repositoriesFolder* # +# bare: +# if true, each repository will be created as a *bare* repository and will not +# have a working directory. +# +# if false, each repository will be created as a normal repository suitable +# for local work. +# # mirror: # if true, each repository HEAD is reset to *origin/master* after each pull. # The repository will be flagged *isFrozen* after the initial clone. diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index b27371d2..3941c9f4 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -22,7 +22,7 @@ ### Older Releases -**0.5.2** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.zip)|[war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.war)) based on [JGit 1.0.0 (201106090707-r)][jgit]   *released 2006-06-28* +**0.5.2** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.2.zip)|[war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.2.war)) based on [JGit 1.0.0 (201106090707-r)][jgit]   *released 2011-07-27* - fixed: active repositories with a HEAD that pointed to an empty branch caused internal errors (issue 14) - fixed: bare-cloned repositories were listed as (empty) and were not clickable (issue 13) @@ -36,13 +36,13 @@ - updated: MarkdownPapers 1.1.0 - updated: Jetty 7.4.3 -**0.5.1** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.zip)|[war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.war)) based on [JGit 1.0.0 (201106090707-r)][jgit]   *released 2006-06-28* +**0.5.1** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.zip)|[war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.war)) based on [JGit 1.0.0 (201106090707-r)][jgit]   *released 2011-06-28* - clarified SSL certificate generation and configuration for both server-side and client-side - added some more troubleshooting information to documentation - replaced JavaService with Apache Commons Daemon -**0.5.0** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.0.zip)|[war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.0.war)) based on [JGit 1.0.0 (201106090707-r)][jgit]   *released 2006-06-26* +**0.5.0** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.0.zip)|[war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.0.war)) based on [JGit 1.0.0 (201106090707-r)][jgit]   *released 2011-06-26* - initial release -- 2.39.5