diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-08-01 11:58:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-01 12:01:01 -0700 |
| commit | d50cb7569cfb6e04ba48900821618d28012f334e (patch) | |
| tree | 641264cefb155981b8861759cd39665ffcd04cd2 /contrib | |
| parent | Merge branch 'ms/subtree-install-fix' (diff) | |
| parent | many small typofixes (diff) | |
| download | tgif-d50cb7569cfb6e04ba48900821618d28012f334e.tar.xz | |
Merge branch 'ob/typofixes'
* ob/typofixes:
many small typofixes
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/ciabot/ciabot.py | 2 | ||||
| -rwxr-xr-x | contrib/ciabot/ciabot.sh | 4 | ||||
| -rw-r--r-- | contrib/subtree/git-subtree.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/contrib/ciabot/ciabot.py b/contrib/ciabot/ciabot.py index 36b5665ff8..befa0c3967 100755 --- a/contrib/ciabot/ciabot.py +++ b/contrib/ciabot/ciabot.py @@ -70,7 +70,7 @@ tinyifier = "http://tinyurl.com/api-create.php?url=" # 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} # diff --git a/contrib/ciabot/ciabot.sh b/contrib/ciabot/ciabot.sh index 3fbbc534ae..dfb71a1a15 100755 --- a/contrib/ciabot/ciabot.sh +++ b/contrib/ciabot/ciabot.sh @@ -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, diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 7ba853eeda..e0957eee55 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -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 |