From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jun 2016 16:56:42 +0000 (-0700)
Subject: Merge branch 'pc/occurred'
X-Git-Tag: v2.10.0-rc0~189
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af325b0f9abacda405e19947a929ad5a3a14cb90?hp=0bbda4bac71605af21be2670c1f4d04d10594fcc

Merge branch 'pc/occurred'

* pc/occurred:
config.c: fix misspelt "occurred" in an error message
refs.h: fix misspelt "occurred" in a comment
---

diff --git a/config.c b/config.c
index f51c56bf92..d7ce34b33d 100644
--- a/config.c
+++ b/config.c
@@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data)
 		 * something went really wrong and we should stop
 		 * immediately.
 		 */
-		die(_("unknown error occured while reading the configuration files"));
+		die(_("unknown error occurred while reading the configuration files"));
 }
 
 static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
diff --git a/refs.h b/refs.h
index 9230d47142..56089d5724 100644
--- a/refs.h
+++ b/refs.h
@@ -345,7 +345,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
  *     msg -- a message describing the change (for the reflog).
  *
  *     err -- a strbuf for receiving a description of any error that
- *         might have occured.
+ *         might have occurred.
  *
  * The functions make internal copies of refname and msg, so the
  * caller retains ownership of these parameters.