summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-28 20:06:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-28 20:06:53 (GMT)
commit45d141a1ddbc55c220ad4c726c02bbbf7a69247a (patch)
tree3c85529be087e76d526f849ece8d7601fb53075f
parent3d875f96f1974ccd9f5f25eede974b58aeb93b5e (diff)
parent3584cff71c62586c050505b80d7d4c9b1b290101 (diff)
downloadgit-45d141a1ddbc55c220ad4c726c02bbbf7a69247a.zip
git-45d141a1ddbc55c220ad4c726c02bbbf7a69247a.tar.gz
git-45d141a1ddbc55c220ad4c726c02bbbf7a69247a.tar.bz2
Merge branch 'en/typofixes'
Typofixes. * en/typofixes: merge-ort: fix completely wrong comment trace2.h: fix trivial comment typo
-rw-r--r--merge-ort.c2
-rw-r--r--trace2.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/merge-ort.c b/merge-ort.c
index 35aa979..0a76952 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -4096,7 +4096,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)
state.istate = index;
original_cache_nr = index->cache_nr;
- /* Put every entry from paths into plist, then sort */
+ /* Append every entry from conflicted into index, then sort */
strmap_for_each_entry(&opt->priv->conflicted, &iter, e) {
const char *path = e->key;
struct conflict_info *ci = e->value;
diff --git a/trace2.h b/trace2.h
index 9b7286c..2f450ab 100644
--- a/trace2.h
+++ b/trace2.h
@@ -350,7 +350,7 @@ void trace2_def_repo_fl(const char *file, int line, struct repository *repo);
* being started, such as "read_recursive" or "do_read_index".
*
* The `repo` field, if set, will be used to get the "repo-id", so that
- * recursive oerations can be attributed to the correct repository.
+ * recursive operations can be attributed to the correct repository.
*/
void trace2_region_enter_fl(const char *file, int line, const char *category,
const char *label, const struct repository *repo, ...);