{"thread":{"id":"2113","subject":"[PATCH] Typo fixes.","startedAt":"2005-10-15T04:59:24Z","lastAt":"2005-10-18T20:31:59Z","messageCount":2,"participants":["Pavel Roskin","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"10118","messageId":"1129352364.16454.1.camel@dv","threadId":"2113","inReplyTo":null,"subject":"[PATCH] Typo fixes.","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2005-10-15T04:59:24Z","receivedAt":"2005-10-15T04:59:24Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Signed-off-by: Pavel Roskin <proski@gnu.org>\n\n\n---\n\n Documentation/make-cogito-asciidoc |    2 +-\n README.osx                         |    2 +-\n cg-commit                          |    2 +-\n cg-help                            |    2 +-\n cg-merge                           |    6 +++---\n cg-mkpatch                         |    4 ++--\n cg-restore                         |    2 +-\n 7 files changed, 10 insertions(+), 10 deletions(-)\n\napplies-to: a216c765a79537dd95d3ef4ac619e5968496bfb9\n5324919b894f5a39436b3bdb163037c3a76a41cb\ndiff --git a/Documentation/make-cogito-asciidoc b/Documentation/make-cogito-asciidoc\nindex fc8111e..3a0d337 100755\n--- a/Documentation/make-cogito-asciidoc\n+++ b/Documentation/make-cogito-asciidoc\n@@ -119,7 +119,7 @@ LOCATION::\n \n COMMIT_ID, FROM_ID, TO_ID, BASE_COMMIT::\n \tIndicates an ID resolving to a commit. The following expressions can\n-\tbe used interchangably as IDs:\n+\tbe used interchangeably as IDs:\n \t- empty string, 'this' or 'HEAD' (current HEAD)\n \t- branch name (as registered with $(man 1 cg-branch-add))\n \t- tag name (as registered with $(man 1 cg-tag))\ndiff --git a/README.osx b/README.osx\nindex 8385cde..e82ef79 100644\n--- a/README.osx\n+++ b/README.osx\n@@ -26,6 +26,6 @@ Recommendations:\n The gnu versions of \"stat\" and \"date\" are preferred over their BSD\n variants.\n \n-\"patch\", \"diff\", \"merge\", \"curl\" and \"rysnc\" are required.  OS X.4\n+\"patch\", \"diff\", \"merge\", \"curl\" and \"rsync\" are required.  OS X.4\n includes recent versions of these tools.  If you are not running X.4,\n you may wish to check this.\ndiff --git a/cg-commit b/cg-commit\nindex 4345bd5..83dcbe8 100755\n--- a/cg-commit\n+++ b/cg-commit\n@@ -42,7 +42,7 @@\n # -f::\n #\tForce the commit even when there's \"nothing to commit\", that is\n #\tthe tree is the same as the last time you committed, no changes\n-#\thappenned.\n+#\thappened.\n #\n # -N::\n #\tDon't add the files to the object database, just update the caches\ndiff --git a/cg-help b/cg-help\nindex 62fb112..83b1a3f 100755\n--- a/cg-help\n+++ b/cg-help\n@@ -97,7 +97,7 @@ $(print_command_listing $REGULAR_COMMAND\n Advanced (low-level or dangerous) commands:\n $(print_command_listing $ADVANCED_COMMANDS)\n \n-These expressions can be used interchangably as \"ID\"s:\n+These expressions can be used interchangeably as \"ID\"s:\n \tempty string, \"this\" or \"HEAD\" (current HEAD)\n \tbranch name (as registered with cg-branch-add)\n \ttag name (as registered with cg-tag)\ndiff --git a/cg-merge b/cg-merge\nindex 2770a9d..ee92651 100755\n--- a/cg-merge\n+++ b/cg-merge\n@@ -40,7 +40,7 @@\n #\n # -c::\n #\tParameter specifies that you want to have tree merge never\n-#\tautocomitted, but want to review and commit it manually. This will\n+#\tautocommitted, but want to review and commit it manually. This will\n #\tbasically make cg-merge always behave like there were conflicts\n #\tduring the merge.\n #\n@@ -52,7 +52,7 @@\n #\targuments:\n #\t\tBRANCHNAME BASE CURHEAD MERGEDHEAD MERGETYPE\n #\tMERGETYPE is either \"forward\" or \"tree\". The merge is\n-#\tcancelled if the script returns non-zero exit code.\n+#\tcanceled if the script returns non-zero exit code.\n #\n # $GIT_DIR/hooks/merge-post::\n #\tIf the file exists and is executable it will be executed after\n@@ -71,7 +71,7 @@ _git_requires_root=1\n prehook()\n {\n \tif [ -x $_git/hooks/merge-pre ]; then\n-\t\t$_git/hooks/merge-pre \"$branchname\" \"$base\" \"$head\" \"$branch\" \"$@\" || die \"merge cancelled by hook\"\n+\t\t$_git/hooks/merge-pre \"$branchname\" \"$base\" \"$head\" \"$branch\" \"$@\" || die \"merge canceled by hook\"\n \tfi\n }\n \ndiff --git a/cg-mkpatch b/cg-mkpatch\nindex 0cd136f..42a5125 100755\n--- a/cg-mkpatch\n+++ b/cg-mkpatch\n@@ -10,13 +10,13 @@\n # -d DIRNAME::\n #\tSplit the patches to separate files with their names in the\n #\tformat \"%02d.patch\", created in directory DIRNAME (will be\n-#\tcreated if non-existant). Note that this makes sense only\n+#\tcreated if non-existent). Note that this makes sense only\n #\twhen generating patch series, that is when you use the -r\n #\targument.\n #\n # -f FORMAT::\n #\tFormat string used for generating the patch filename when\n-#\toutputting the splitted-out patches (that is, passed the -d\n+#\toutputting the split-out patches (that is, passed the -d\n #\toption). This is by default \"%s/%02d-%s.patch\". The first %s\n #\trepresents the directory name and %d represents the patch\n #\tsequence number. The last %s is mangled first line of the\ndiff --git a/cg-restore b/cg-restore\nindex d4d49e9..8e61c92 100755\n--- a/cg-restore\n+++ b/cg-restore\n@@ -14,7 +14,7 @@\n # This command is complementary to the `cg-reset` command, which\n # forcefully abandons all the changes in the working tree and\n # restores everything to a proper state (including unseeking,\n-# cancelling merge in progress and rebuilding indexes).\n+# canceling merge in progress and rebuilding indexes).\n #\n # OPTIONS\n # -------\n---\n0.99.8.GIT\n\n-- \nRegards,\nPavel Roskin\n"},{"id":"10219","messageId":"20051018203159.GN30889@pasky.or.cz","threadId":"2113","inReplyTo":"1129352364.16454.1.camel@dv","subject":"Re: [PATCH] Typo fixes.","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-10-18T20:31:59Z","receivedAt":"2005-10-18T20:31:59Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sat, Oct 15, 2005 at 06:59:24AM CEST, I got a letter\nwhere Pavel Roskin <proski@gnu.org> told me that...\n> Signed-off-by: Pavel Roskin <proski@gnu.org>\n\nThanks. Applied except for the cancelled -> canceled changes, I like\n\"cancelled\" better - I'm used to it, so I would probably use it again\nanyway, and at any rate it seems more regular.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"}]}