From: Stefano Lattarini stefano.lattar...@gmail.com
Date: Fri, 12 Apr 2013 00:36:10 +0200
Most of these were found using Lucas De Marchi's codespell tool.
Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
Thanks for reading.
builtin/apply.c | 6 +++---
commit.c | 2 +-
commit.h | 2 +-
diff.c | 2 +-
git-add--interactive.perl| 2 +-
git-cvsserver.perl | 4 ++--
git-quiltimport.sh | 2 +-
gitweb/gitweb.perl | 6 +++---
perl/Git.pm | 2 +-
perl/Git/I18N.pm | 2 +-
perl/private-Error.pm| 2 +-
sequencer.c | 2 +-
t/t1006-cat-file.sh | 2 +-
t/t3701-add-interactive.sh | 2 +-
t/t4014-format-patch.sh | 6 +++---
t/t4124-apply-ws-rule.sh | 2 +-
t/t6030-bisect-porcelain.sh | 2 +-
t/t7601-merge-pull-config.sh | 2 +-
t/t7610-mergetool.sh | 2 +-
t/t9001-send-email.sh| 4 ++--
transport-helper.c | 2 +-
transport.h | 2 +-
xdiff/xdiffi.c | 2 +-
xdiff/xhistogram.c | 2 +-
24 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 06f5320b..f6a3c97d 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1921,7 +1921,7 @@ static int parse_binary(char *buffer, unsigned long size,
struct patch *patch)
}
/*
- * Read the patch text in buffer taht extends for size bytes; stop
+ * Read the patch text in buffer that extends for size bytes; stop
* reading after seeing a single patch (i.e. changes to a single file).
* Create fragments (i.e. patch hunks) and hang them to the given patch.
* Return the number of bytes consumed, so that the caller can call us
@@ -3025,7 +3025,7 @@ static struct patch *in_fn_table(const char *name)
*
* The latter is needed to deal with a case where two paths A and B
* are swapped by first renaming A to B and then renaming B to A;
- * moving A to B should not be prevented due to presense of B as we
+ * moving A to B should not be prevented due to presence of B as we
* will remove it in a later patch.
*/
#define PATH_TO_BE_DELETED ((struct patch *) -2)
@@ -3509,7 +3509,7 @@ static int check_patch(struct patch *patch)
*
* A patch to swap-rename between A and B would first rename A
* to B and then rename B to A. While applying the first one,
-* the presense of B should not stop A from getting renamed to
+* the presence of B should not stop A from getting renamed to
* B; ask to_be_deleted() about the later rename. Removal of
* B and rename from A to B is handled the same way by asking
* was_deleted().
diff --git a/commit.c b/commit.c
index e8eb0aec..1a41757e 100644
--- a/commit.c
+++ b/commit.c
@@ -834,7 +834,7 @@ struct commit_list *get_merge_bases(struct commit *one,
struct commit *two,
}
/*
- * Is commit a decendant of one of the elements on the with_commit list?
+ * Is commit a descendant of one of the elements on the with_commit list?
*/
int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
{
diff --git a/commit.h b/commit.h
index 4138bb4c..252c7f87 100644
--- a/commit.h
+++ b/commit.h
@@ -164,7 +164,7 @@ extern struct commit_list *get_merge_bases(struct commit
*rev1, struct commit *r
extern struct commit_list *get_merge_bases_many(struct commit *one, int n,
struct commit **twos, int cleanup);
extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
-/* largest postive number a signed 32-bit integer can contain */
+/* largest positive number a signed 32-bit integer can contain */
#define INFINITE_DEPTH 0x7fff
extern int register_shallow(const unsigned char *sha1);
diff --git a/diff.c b/diff.c
index db952a5b..0eb26535 100644
--- a/diff.c
+++ b/diff.c
@@ -1565,7 +1565,7 @@ static void show_stats(struct diffstat_t *data, struct
diff_options *options)
* Binary files are displayed with Bin XXX - YYY bytes
* instead of the change count and graph. This part is treated
* similarly to the graph part, except that it is not
-* scaled. If total width is too small to accomodate the
+* scaled. If total width is too small to accommodate the
* guaranteed minimum width of the filename part and the
* separators and this message, this message will overflow
* making the line longer than the maximum width.
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 710764ab..d2c4ce6e 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1247,7 +1247,7 @@ sub summarize_hunk {
# Print a one-line summary of each hunk in the array ref in
-# the first argument, starting wih the index in the 2nd.
+# the first argument, starting with the index in the 2nd.
sub display_hunks {
my ($hunks,
