Commit 98e023de authored by Ondřej Bílka's avatar Ondřej Bílka Committed by Junio C Hamano

many small typofixes

Signed-off-by: 's avatarOndřej Bílka <neleai@seznam.cz>
Reviewed-by: 's avatarMarc Branchaud <marcnarc@xiplink.com>
Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
parent 749f763d
......@@ -94,7 +94,7 @@ your language, document it in the INSTALL file.
6. There is a file command-list.txt in the distribution main directory
that categorizes commands by type, so they can be listed in appropriate
subsections in the documentation's summary command list. Add an entry
for yours. To understand the categories, look at git-cmmands.txt
for yours. To understand the categories, look at git-commands.txt
in the main directory.
7. Give the maintainer one paragraph to include in the RelNotes file
......
......@@ -59,7 +59,7 @@ function.
`reset_revision_walk`::
Reset the flags used by the revision walking api. You can use
this to do multiple sequencial revision walks.
this to do multiple sequential revision walks.
Data structures
---------------
......
......@@ -379,7 +379,7 @@ static void handle_tag(const char *name, struct tag *tag)
int tagged_mark;
struct commit *p;
/* Trees have no identifer in fast-export output, thus we have no way
/* Trees have no identifier in fast-export output, thus we have no way
* to output tags of trees, tags of tags of trees, etc. Simply omit
* such tags.
*/
......
......@@ -92,7 +92,7 @@ static NORETURN int die_push_simple(struct branch *branch, struct remote *remote
if (!short_upstream)
short_upstream = branch->merge[0]->src;
/*
* Don't show advice for people who explicitely set
* Don't show advice for people who explicitly set
* push.default.
*/
if (push_default == PUSH_DEFAULT_UNSPECIFIED)
......
......@@ -491,7 +491,7 @@ extern void *read_blob_data_from_index(struct index_state *, const char *, unsig
extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
#define PATHSPEC_ONESTAR 1 /* the pathspec pattern sastisfies GFNM_ONESTAR */
#define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */
struct pathspec {
const char **raw; /* get_pathspec() result, not freed by free_pathspec() */
......
......@@ -165,7 +165,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
/*
* Coalesce new lines into base by finding the LCS
* - Create the table to run dynamic programing
* - Create the table to run dynamic programming
* - Compute the LCS
* - Then reverse read the direction structure:
* - If we have MATCH, assign parent to base flag, and consume
......
......@@ -70,7 +70,7 @@
# The template used to generate the XML messages to CIA. You can make
# visible changes to the IRC-bot notification lines by hacking this.
# The default will produce a notfication line that looks like this:
# The default will produce a notification line that looks like this:
#
# ${project}: ${author} ${repo}:${branch} * ${rev} ${files}: ${logmsg} ${url}
#
......
......@@ -39,7 +39,7 @@
# done
#
# The reason for the tac call is that git rev-list emits commits from
# most recent to least - better to ship notifactions from oldest to newest.
# most recent to least - better to ship notifications from oldest to newest.
#
# Configuration variables affecting this script:
#
......@@ -64,7 +64,7 @@
# down. It is unknown whether this is still an issue in 2010, but
# XML-RPC would be annoying to do from sh in any case. (XML-RPC does
# have the advantage that it guarantees notification of multiple commits
# shpped from an update in their actual order.)
# shipped from an update in their actual order.)
#
# The project as known to CIA. You can set this with a -p option,
......
......@@ -270,7 +270,7 @@ git-extensions repository in ~/git-extensions/:
name
You can omit the --squash flag, but doing so will increase the number
of commits that are incldued in your local repository.
of commits that are included in your local repository.
We now have a ~/git-extensions/git-subtree directory containing code
from the master branch of git://github.com/apenwarr/git-subtree.git
......
......@@ -144,7 +144,7 @@ setup_user_tool () {
setup_tool () {
tool="$1"
# Fallback definitions, to be overriden by tools.
# Fallback definitions, to be overridden by tools.
can_merge () {
return 0
}
......
......@@ -1786,7 +1786,7 @@ def run(self, args):
missingGitTags = gitTags - p4Labels
self.exportGitTags(missingGitTags)
# exit with error unless everything applied perfecly
# exit with error unless everything applied perfectly
if len(commits) != len(applied):
sys.exit(1)
......
......@@ -77,7 +77,7 @@ const char *default_notes_ref(void);
* variable is used, and if that is missing, the default notes ref is used
* ("refs/notes/commits").
*
* If you need to re-intialize a notes_tree structure (e.g. when switching from
* If you need to re-initialize a notes_tree structure (e.g. when switching from
* one notes ref to another), you must first de-initialize the notes_tree
* structure by calling free_notes(struct notes_tree *).
*
......
......@@ -489,7 +489,7 @@ int remove_index_entry_at(struct index_state *istate, int pos)
}
/*
* Remove all cache ententries marked for removal, that is where
* Remove all cache entries marked for removal, that is where
* CE_REMOVE is set in ce_flags. This is much more effective than
* calling remove_index_entry_at() for each entry to be removed.
*/
......@@ -1760,7 +1760,7 @@ static int has_racy_timestamp(struct index_state *istate)
}
/*
* Opportunisticly update the index but do not complain if we can't
* Opportunistically update the index but do not complain if we can't
*/
void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
{
......
......@@ -36,7 +36,7 @@ EOF
# You can set the GITWEB_TEST_INSTALLED environment variable to
# the gitwebdir (the directory where gitweb is installed / deployed to)
# of an existing gitweb instalation to test that installation,
# of an existing gitweb installation to test that installation,
# or simply to pathname of installed gitweb script.
if test -n "$GITWEB_TEST_INSTALLED" ; then
if test -d $GITWEB_TEST_INSTALLED; then
......
......@@ -34,7 +34,7 @@ save_tag () {
mv sed.script.tmp sed.script
}
# Replace unhelpful sha1 hashses with their symbolic equivalents
# Replace unhelpful sha1 hashes with their symbolic equivalents
entag () {
sed -f sed.script
}
......
......@@ -109,7 +109,7 @@ test_expect_success 'setup conflicted merge' '
'
# First do the merge with resolve and recursive then verify that
# recusive is chosen.
# recursive is chosen.
test_expect_success 'merge picks up the best result' '
git config --unset-all pull.twohead &&
......
......@@ -24,7 +24,7 @@ init_git () {
rm -fr .git &&
git init &&
#git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump
# let's reuse an exisiting dump file!?
# let's reuse an existing dump file!?
git remote add svnsim testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump
git remote add svnfile testsvn::file://$TEST_DIRECTORY/t9154/svn.dump
}
......
......@@ -7,7 +7,7 @@ test_description='test that git handles an svn repository with missing md5sums'
# Loading a node from a svn dumpfile without a Text-Content-Length
# field causes svn to neglect to store or report an md5sum. (it will
# calculate one if you had put Text-Content-Length: 0). This showed
# up in a repository creted with cvs2svn.
# up in a repository created with cvs2svn.
cat > dumpfile.svn <<EOF
SVN-fs-dump-format-version: 1
......
......@@ -28,7 +28,7 @@ test_expect_success 'p4 client newlines, unix' '
test_cmp f-unix-orig f-unix &&
# make sure stored in repo as unix newlines
# use sed to eat python-appened newline
# use sed to eat python-appended newline
p4 -G print //depot/f-unix | marshal_dump data 2 |\
sed \$d >f-unix-p4-print &&
test_cmp f-unix-orig f-unix-p4-print &&
......
......@@ -1132,7 +1132,7 @@ static void *udt_copy_task_routine(void *udt)
#ifndef NO_PTHREADS
/*
* Join thread, with apporiate errors on failure. Name is name for the
* Join thread, with appropriate errors on failure. Name is name for the
* thread (for error messages). Returns 0 on success, 1 on failure.
*/
static int tloop_join(pthread_t thread, const char *name)
......@@ -1198,7 +1198,7 @@ static void udt_kill_transfer(struct unidirectional_transfer *t)
}
/*
* Join process, with apporiate errors on failure. Name is name for the
* Join process, with appropriate errors on failure. Name is name for the
* process (for error messages). Returns 0 on success, 1 on failure.
*/
static int tloop_join(pid_t pid, const char *name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment