summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-04-12 00:36:10 +0200
committerJunio C Hamano <gitster@pobox.com>2013-04-12 13:38:40 -0700
commit41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d (patch)
tree645135f6c34c03a1b409488bfa528536398228b5 /sequencer.c
parent2fec81cbe5a9867bac65bb0aa9e2605a9de68c4d (diff)
downloadgit-41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d.tar.gz
Correct common spelling mistakes in comments and tests
Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index aef5e8a017..bad5077911 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -133,7 +133,7 @@ static void print_advice(int show_hint, struct replay_opts *opts)
if (msg) {
fprintf(stderr, "%s\n", msg);
/*
- * A conflict has occured but the porcelain
+ * A conflict has occurred but the porcelain
* (typically rebase --interactive) wants to take care
* of the commit itself so remove CHERRY_PICK_HEAD
*/