From: Peter Colberg <peter@colberg.org>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Peter Colberg <peter@colberg.org>
Subject: [PATCH v2] Fix spelling of "occurred"
Date: Fri, 10 Jun 2016 15:05:26 -0400 [thread overview]
Message-ID: <1465585526-32187-1-git-send-email-peter@colberg.org> (raw)
In-Reply-To: <CAFZEwPMgYCau=LxdtjZ2WVJXp91mXYG5bc=0X0mo_eJ+eYqLHA@mail.gmail.com>
Signed-off-by: Peter Colberg <peter@colberg.org>
---
config.c | 2 +-
refs.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c
index f51c56b..d7ce34b 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 9230d47..56089d5 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.
--
2.8.1
next prev parent reply other threads:[~2016-06-10 19:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 14:22 [PATCH] Fix spelling of "occurred" Peter Colberg
2016-06-10 18:51 ` Pranit Bauva
2016-06-10 19:05 ` Peter Colberg [this message]
2016-06-10 21:15 ` [PATCH v2] " Junio C Hamano
2016-06-10 22:04 ` Peter Colberg
2016-06-10 22:22 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465585526-32187-1-git-send-email-peter@colberg.org \
--to=peter@colberg.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).