Skip to content

Commit

Permalink
Merge pull request #276 from mrjoel/mrjoel-typofixes
Browse files Browse the repository at this point in the history
typo fixes
  • Loading branch information
gitblit committed Jun 30, 2015
2 parents 1ffca12 + a3e480e commit 0092262
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/gitblit/manager/UserManager.java
Expand Up @@ -120,7 +120,7 @@ public UserManager start() {
File realmFile = runtimeManager.getFileOrFolder(Keys.realm.userService, "${baseFolder}/users.conf");
service = createUserService(realmFile);
} catch (InstantiationException | IllegalAccessException e) {
logger.error("failed to instanciate user service {}: {}", realm, e.getMessage());
logger.error("failed to instantiate user service {}: {}", realm, e.getMessage());
}
}
setUserService(service);
Expand Down
2 changes: 1 addition & 1 deletion src/site/tickets_overview.mkd
Expand Up @@ -70,7 +70,7 @@ Gitblit has adopted Gerrit's three-repository workflow and *magic ref* design fo
1. The organizational unit of the Gitblit Tickets feature is the *ticket*.
2. A *ticket* can be used to report a bug, request an enhancement, ask a question, etc. A ticket can also be used to collaborate on a *patchset* that addresses the request.
3. A *patchset* is a series of commits from a merge base that exists in the target branch of your repository to the tip of the patchset. A patchset may only contain a single commit, or it may contain dozens. This is similar to the commits in a *Pull Request*. One important distinction here is that in Gitblit, each *Patchset* is developed on a separate branch and can be completely rewritten without losing the previous patchsets (this creates a new patchset).
4. A *ticket* monitors the development of *patchsets* by tracking *revisions* to *patchsets*. The ticket alslo monitors rewritten patchsets. Each *patchset* is developed on it's own Git branch.
4. A *ticket* monitors the development of *patchsets* by tracking *revisions* to *patchsets*. The ticket also monitors rewritten patchsets. Each *patchset* is developed on it's own Git branch.

Tracking *patchsets* is similar in concept to Gerrit, but there is a critical difference. In Gerrit, *every* commit in the *patchset* has it's own ticket **AND** Git branch. In Gerrit, *patchsets* can be easily rewritten and for each rewritten commit, a new branch ref is created. This leads to an explosion in refs for the repository over time. In Gitblit, only the tip of the *patchset* gets a branch ref and this branch ref is updated, like a regular branch, unless a rewrite is detected.

Expand Down

0 comments on commit 0092262

Please sign in to comment.