aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-07-15 11:57:42 +0200
committerMichael Muré <batolettre@gmail.com>2020-07-15 11:57:42 +0200
commitc448cf8cd3c03e71f2ea40d2aac68f77b963f993 (patch)
tree9e3f11bf357962f5154b594edd01b547eb42edbd
parent91f07d4753509054fbc8af14dd46b062c2138395 (diff)
downloadgit-bug-c448cf8cd3c03e71f2ea40d2aac68f77b963f993.tar.gz
typos and minor readme fix
-rw-r--r--README.md2
-rw-r--r--bug/op_add_comment.go2
-rw-r--r--doc/model.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 52a734bf..91917671 100644
--- a/README.md
+++ b/README.md
@@ -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)
diff --git a/bug/op_add_comment.go b/bug/op_add_comment.go
index 04965b8c..3f19e42e 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 c6d12bf5..c4252e6c 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.