typos and minor readme fix

This commit is contained in:
Michael Muré 2020-07-15 11:57:42 +02:00
parent 91f07d4753
commit c448cf8cd3
No known key found for this signature in database
GPG Key ID: A4457C029293126F
3 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,7 @@
<div align="center">
[![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)

View File

@ -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 {

View File

@ -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.