Browse Source

Merge branch 'pc/occurred' into maint

Typofix.

* pc/occurred:
  config.c: fix misspelt "occurred" in an error message
  refs.h: fix misspelt "occurred" in a comment
maint
Junio C Hamano 9 years ago
parent
commit
9d3d0dbb14
  1. 2
      config.c
  2. 2
      refs.h

2
config.c

@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data) @@ -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)

2
refs.h

@ -345,7 +345,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err); @@ -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.

Loading…
Cancel
Save