aboutsummaryrefslogtreecommitdiff
path: root/refs.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-27 09:56:42 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-27 09:56:42 -0700
commitaf325b0f9abacda405e19947a929ad5a3a14cb90 (patch)
tree7d053b28eaf6805144c044600fc1a77919f2f842 /refs.h
parent0bbda4bac71605af21be2670c1f4d04d10594fcc (diff)
parent3a39f61e0468d7aea1a6f57ddbdcc74aaafa8410 (diff)
downloadgit-af325b0f9abacda405e19947a929ad5a3a14cb90.tar.gz
git-af325b0f9abacda405e19947a929ad5a3a14cb90.tar.xz
Merge branch 'pc/occurred'
* pc/occurred: config.c: fix misspelt "occurred" in an error message refs.h: fix misspelt "occurred" in a comment
Diffstat (limited to 'refs.h')
-rw-r--r--refs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/refs.h b/refs.h
index 9230d4714..56089d572 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.