diff --git a/README.md b/README.md index 52a734bfaa69f5a09a0315e01181cc2e2f086175..9191767159143541420853a927c700c88a99b844 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@
-[![Build Status](https://travis-ci.org/MichaelMure/git-bug.svg?branch=master)](https://travis-ci.org/MichaelMure/git-bug) +[![Build Status](https://travis-ci.com/MichaelMure/git-bug.svg?branch=master)](https://travis-ci.com/MichaelMure/git-bug) [![Backers on Open Collective](https://opencollective.com/git-bug/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/git-bug/sponsors/badge.svg)](#sponsors) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3+-blue.svg)](http://www.gnu.org/licenses/gpl-3.0) diff --git a/bug/op_add_comment.go b/bug/op_add_comment.go index 04965b8ce1b711e77a2d086b55d4d1f3a1d24b82..3f19e42e784185336811160dae437e7c527fff3b 100644 --- a/bug/op_add_comment.go +++ b/bug/op_add_comment.go @@ -69,7 +69,7 @@ func (op *AddCommentOperation) Validate() error { return nil } -// UnmarshalJSON is a two step JSON unmarshaling +// UnmarshalJSON is a two step JSON unmarshalling // This workaround is necessary to avoid the inner OpBase.MarshalJSON // overriding the outer op's MarshalJSON func (op *AddCommentOperation) UnmarshalJSON(data []byte) error { diff --git a/doc/model.md b/doc/model.md index c6d12bf5dc3f05c82a92e96f23f3f12db7db43ec..c4252e6c2c325aba6cce5d48f914b6db471c4bbc 100644 --- a/doc/model.md +++ b/doc/model.md @@ -73,7 +73,7 @@ Now that we have this, we can easily merge our bugs without conflict. When pulli ## You can't have a simple consecutive index for your bugs -The same way git can't have a simple counter as identifier for it's commits as SVN does, we can't have consecutive identifiers for bugs. +The same way git can't have a simple counter as identifier for its commits as SVN does, we can't have consecutive identifiers for bugs. `git-bug` uses as identifier the hash of the first commit in the chain of commits of the bug. As this hash is ultimately computed with the content of the `CREATE` operation that includes title, message and a timestamp, it will be unique and prevent collision.