{"thread":{"id":"16494","subject":"[PATCH] Fix typos in the documentation.","startedAt":"2008-11-27T07:32:01Z","lastAt":"2008-11-27T21:16:35Z","messageCount":4,"participants":["Ralf Wildenhues","Andreas Ericsson","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"96607","messageId":"20081127073201.GD8267@ins.uni-bonn.de","threadId":"16494","inReplyTo":null,"subject":"[PATCH] Fix typos in the documentation.","fromName":"Ralf Wildenhues","fromEmail":"ralf.wildenhues@gmx.de","sentAt":"2008-11-27T07:32:01Z","receivedAt":"2008-11-27T07:32:01Z","isPatch":true,"sender":{"key":"ralf.wildenhues@gmx.de","avatar":null},"body":"Signed-off-by: Ralf Wildenhues \n---\n\nThis patch is against pu.\n\nCheers, and thanks for git,\nRalf\n\n Documentation/RelNotes-1.6.0.4.txt | 2 +-\n Documentation/RelNotes-1.6.1.txt | 6 +++---\n Documentation/config.txt | 2 +-\n Documentation/git-add.txt | 2 +-\n Documentation/git-bisect.txt | 6 +++---\n Documentation/git-commit.txt | 2 +-\n Documentation/git-svn.txt | 2 +-\n Documentation/technical/pack-protocol.txt | 4 ++--\n Documentation/user-manual.txt | 2 +-\n 9 files changed, 14 insertions(+), 14 deletions(-)\n\ndiff --git a/Documentation/RelNotes-1.6.0.4.txt b/Documentation/RelNotes-1.6.0.4.txt\nindex fba3f30..d522661 100644\n--- a/Documentation/RelNotes-1.6.0.4.txt\n+++ b/Documentation/RelNotes-1.6.0.4.txt\n@@ -30,7 +30,7 @@ Fixes since v1.6.0.3\n * 'git status' incorrectly reported a submodule directory as an untracked\n directory.\n \n-* 'git svn' used deprecated 'git-foo' form of subcommand invocaition.\n+* 'git svn' used deprecated 'git-foo' form of subcommand invocation.\n \n * 'git update-ref -d' to remove a reference did not honor --no-deref option.\n \ndiff --git a/Documentation/RelNotes-1.6.1.txt b/Documentation/RelNotes-1.6.1.txt\nindex 7fdf83f..848541a 100644\n--- a/Documentation/RelNotes-1.6.1.txt\n+++ b/Documentation/RelNotes-1.6.1.txt\n@@ -55,9 +55,9 @@ on.\n to a non-zero value to accept the suggestion when git can uniquely\n guess.\n \n-* The packfile machinery hopefully is more robust when dealilng with\n+* The packfile machinery hopefully is more robust when dealing with\n corrupt packs if redundant objects involved in the corruption are\n- available elsehwere.\n+ available elsewhere.\n \n * \"git add -N path...\" adds the named paths as an empty blob, so that\n subsequent \"git diff\" will show a diff as if they are creation events.\n@@ -157,7 +157,7 @@ on.\n * \"git log\" learned \"--source\" to show what ref each commit was reached\n from.\n \n-* \"git log\" also learned \"--simplify-by-decration\" to show the\n+* \"git log\" also learned \"--simplify-by-decoration\" to show the\n birds-eye-view of the topology of the history.\n \n * \"git log --pretty=format:\" learned \"%d\" format element that inserts\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 2283300..6d51967 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -841,7 +841,7 @@ gui.fastcopyblame::\n \trepositories at the expense of less thorough copy detection.\n \n gui.copyblamethreshold::\n-\tSpecifies the theshold to use in 'git gui blame' original location\n+\tSpecifies the threshold to use in 'git gui blame' original location\n \tdetection, measured in alphanumeric characters. See the\n \tlinkgit:git-blame[1] manual for more information on copy detection.\n \ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex 6fc20b0..7c129cb 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -98,7 +98,7 @@ OPTIONS\n \tRecord only the fact that the path will be added later. An entry\n \tfor the path is placed in the index with no content. This is\n \tuseful for, among other things, showing the unstaged content of\n-\tsuch files with 'git diff' and commiting them with 'git commit\n+\tsuch files with 'git diff' and committing them with 'git commit\n \t-a'.\n \n --refresh::\ndiff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt\nindex 2ac77fb..75083e6 100644\n--- a/Documentation/git-bisect.txt\n+++ b/Documentation/git-bisect.txt\n@@ -192,10 +192,10 @@ Bisect replace\n \n This subcommand can help when you have a branch or a part of a\n branch that isn't easily bisectable because of a bug that has been\n-fixed latter.\n+fixed later.\n \n We suppose that a bug as been introduced at some point, say A, and\n-that it has been fixed latter at another point, say B, but that\n+that it has been fixed later at another point, say B, but that\n between these points the code is not easily testable because of the\n bug, so it's not easy to bisect between these points.\n \n@@ -244,7 +244,7 @@ because the bug introduced by commit A and fixed by commit B will not\n annoy you anymore.\n \n As the refs created by \"git bisect replace\" can be shared between\n-developers, this feature might be especially usefull on big projects\n+developers, this feature might be especially useful on big projects\n where many people often bisect the same code base.\n \n If you give the `--no-replace` to \"git bisect start\", then the\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex a1ce9a8..6203461 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -95,7 +95,7 @@ OPTIONS\n \n -s::\n --signoff::\n-\tAdd Signed-off-by line by the commiter at the end of the commit\n+\tAdd Signed-off-by line by the committer at the end of the commit\n \tlog message.\n \n -n::\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex ba94cd1..8d0c421 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -109,7 +109,7 @@ COMMANDS\n \n This works similarly to `svn update` or 'git-pull' except that\n it preserves linear history with 'git-rebase' instead of\n-'git-merge' for ease of dcommiting with 'git-svn'.\n+'git-merge' for ease of dcommitting with 'git-svn'.\n \n This accepts all options that 'git-svn fetch' and 'git-rebase'\n accept. However, '--fetch-all' only fetches from the current\ndiff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt\nindex 7396f69..696dd00 100644\n--- a/Documentation/technical/pack-protocol.txt\n+++ b/Documentation/technical/pack-protocol.txt\n@@ -59,13 +59,13 @@ When tellme-more extension is used:\n \tC: SHA1 old-SHA1 -- This is ancestor of that, you might know\n \tC: SHA1 old-SHA1\n \tC: ...\n-\tC: # flush -- have you heard ehough?\n+\tC: # flush -- have you heard enough?\n \tS: tellme-more old-SHA1' -- I still want to know more about this one\n \tS: # flush -- please give me more\n \tC: SHA1 old-SHA1'\n \tC: SHA1 old-SHA1'\n \tC: ...\n-\tC: # flush -- have you heard ehough?\n+\tC: # flush -- have you heard enough?\n \tS: # flush -- yes, thanks, we've heard enough\n \tS: XXXXXXX --- packfile contents.\n \ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex c0d8caf..da9c6b2 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -546,7 +546,7 @@ $ git bisect skip\n -------------------------------------------------\n \n In this case, though, git may not eventually be able to tell the first\n-bad one between some first skipped commits and a latter bad commit.\n+bad one between some first skipped commits and a later bad commit.\n \n There are also ways to automate the bisecting process if you have a\n test script that can tell a good from a bad commit. See\n-- \n1.6.0.4.766.g6fc4a\n"},{"id":"96611","messageId":"492E6415.6080101@op5.se","threadId":"16494","inReplyTo":"20081127073201.GD8267@ins.uni-bonn.de","subject":"Re: [PATCH] Fix typos in the documentation.","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2008-11-27T09:10:45Z","receivedAt":"2008-11-27T09:10:45Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Ralf Wildenhues wrote:\n> Signed-off-by: Ralf Wildenhues \n> ---\n> \n> This patch is against pu.\n> \n\n'pu' is a moving target in git. For future reference, it's\nbetter to send patches against 'master'.\n\nOther than that:\nAcked-by: Andreas Ericsson \n\n-- \nAndreas Ericsson andreas.ericsson@op5.se\nOP5 AB www.op5.se\nTel: +46 8-230225 Fax: +46 8-230231\n"},{"id":"96616","messageId":"7vwsepa48n.fsf@gitster.siamese.dyndns.org","threadId":"16494","inReplyTo":"20081127073201.GD8267@ins.uni-bonn.de","subject":"Re: [PATCH] Fix typos in the documentation.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-11-27T09:48:56Z","receivedAt":"2008-11-27T09:48:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Wildenhues writes:\n\n> Signed-off-by: Ralf Wildenhues \n> ---\n>\n> This patch is against pu.\n\nWhile I appreciate your fix, it would have been nicer to have at least\nthree patches in this case, organized like this:\n\n * patch 1 applies to 'maint'. Let's call the result of such application\n 'maint plus fix';\n\n In other words:\n\n\t$ git checkout -b rw/maint-typofix maint\n $ git am -s patch-1\n\n * patch 2 is to be applied on top of the result of merging 'maint plus\n fix' into 'master';\n\n In other words:\n\n\t$ git checkout -b rw/typofix master\n $ git merge rw/maint-typofix\n $ git am -s patch-2\n\n * patch 3 is to contain everything else (it would be even nicer if they\n are split up to apply to individual topic branches that are responsible\n for introducing the typos, but I realize that it would be asking too\n much).\n\n In other words:\n\n\t$ git checkout pu\n $ git merge rw/typofix\n $ git am -s patch-3\n\nI've done the above splitting myself and further did:\n\n\t$ git checkout maint\n $ git merge rw/maint-typofix\n $ git branch -d rw/maint-typofix\n $ git checkout master\n $ git merge rw/typofix\n $ git branch -d rw/typofix\n\nI did not create a single \"patch-3\" but squashed the fixes in to the\nrespective commits on the topic branches, as they are only on 'pu' and not\npart of 'next' (hence I am free to amend and rebase them).\n\nThanks.\n"},{"id":"96646","messageId":"20081127211635.GE29817@ins.uni-bonn.de","threadId":"16494","inReplyTo":"7vwsepa48n.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Fix typos in the documentation.","fromName":"Ralf Wildenhues","fromEmail":"ralf.wildenhues@gmx.de","sentAt":"2008-11-27T21:16:35Z","receivedAt":"2008-11-27T21:16:35Z","isPatch":true,"sender":{"key":"ralf.wildenhues@gmx.de","avatar":null},"body":"Hello Andreas, Junio,\n\n* Andreas Ericsson wrote on Thu, Nov 27, 2008 at 10:10:45AM CET:\n> Ralf Wildenhues wrote:\n>>\n>> This patch is against pu.\n\n> 'pu' is a moving target in git. For future reference, it's\n> better to send patches against 'master'.\n\n* Junio C Hamano wrote on Thu, Nov 27, 2008 at 10:48:56AM CET:\n> \n> While I appreciate your fix, it would have been nicer to have at least\n> three patches in this case, organized like this:\n\nBoth obvious improvements. Thanks for teaching me again how to properly\nbehave on this list, I've not been following it for a while and forgot.\n\nCheers, and keep up the good work,\nRalf\n"}]}