{"thread":{"id":"24438","subject":"[PATCH 2/2] Improve \"move the whole tree into a subdirectory\" example.","startedAt":"2010-07-19T21:17:17Z","lastAt":"2010-07-21T05:48:32Z","messageCount":6,"participants":["Ville Skyttä","Jonathan Nieder","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"145825","messageId":"1279574238-16649-1-git-send-email-ville.skytta@iki.fi","threadId":"24438","inReplyTo":null,"subject":"[PATCH 1/2] Documentation spelling fixes.","fromName":"Ville Skyttä","fromEmail":"ville.skytta@iki.fi","sentAt":"2010-07-19T21:17:17Z","receivedAt":"2010-07-19T21:17:17Z","isPatch":true,"sender":{"key":"ville.skytta@iki.fi","avatar":"https://avatars.githubusercontent.com/u/109152?v=4"},"body":"---\n Documentation/config.txt               |   10 +++++-----\n Documentation/git-bisect-lk2009.txt    |    2 +-\n Documentation/git-commit.txt           |    4 ++--\n Documentation/git-cvsimport.txt        |    4 ++--\n Documentation/git-cvsserver.txt        |    4 ++--\n Documentation/git-hash-object.txt      |    2 +-\n Documentation/git-reset.txt            |    2 +-\n Documentation/gitrepository-layout.txt |    2 +-\n Documentation/urls.txt                 |    2 +-\n 9 files changed, 16 insertions(+), 16 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex e75434b..e7e505d 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -128,7 +128,7 @@ advice.*::\n \t\twhen writing commit messages. Default: true.\n \tcommitBeforeMerge::\n \t\tAdvice shown when linkgit:git-merge[1] refuses to\n-\t\tmerge to avoid overwritting local changes.\n+\t\tmerge to avoid overwriting local changes.\n \t\tDefault: true.\n \tresolveConflict::\n \t\tAdvices shown by various commands when conflicts\n@@ -418,7 +418,7 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.\n \n core.deltaBaseCacheLimit::\n \tMaximum number of bytes to reserve for caching base objects\n-\tthat multiple deltafied objects reference.  By storing the\n+\tthat multiple deltified objects reference.  By storing the\n \tentire decompressed base objects in a cache Git is able\n \tto avoid unpacking and decompressing frequently used base\n \tobjects multiple times.\n@@ -563,7 +563,7 @@ not necessarily be the current directory.\n am.keepcr::\n \tIf true, git-am will call git-mailsplit for patches in mbox format\n \twith parameter '--keep-cr'. In this case git-mailsplit will\n-\tnot remove `\\r` from lines ending with `\\r\\n`. Can be overrriden\n+\tnot remove `\\r` from lines ending with `\\r\\n`. Can be overridden\n \tby giving '--no-keep-cr' from the command line.\n \tSee linkgit:git-am[1], linkgit:git-mailsplit[1].\n \n@@ -1002,7 +1002,7 @@ gitcvs.usecrlfattr::\n \tIf true, the server will look up the end-of-line conversion\n \tattributes for files to determine the '-k' modes to use. If\n \tthe attributes force git to treat a file as text,\n-\tthe '-k' mode will be left blank so cvs clients will\n+\tthe '-k' mode will be left blank so CVS clients will\n \ttreat it as text. If they suppress text conversion, the file\n \twill be set with '-kb' mode, which suppresses any newline munging\n \tthe client might otherwise do. If the attributes do not allow\n@@ -1275,7 +1275,7 @@ instaweb.local::\n \tbe bound to the local IP (127.0.0.1).\n \n instaweb.modulepath::\n-\tThe module path for an apache httpd used by linkgit:git-instaweb[1].\n+\tThe module path for an Apache httpd used by linkgit:git-instaweb[1].\n \n instaweb.port::\n \tThe port number to bind the gitweb httpd to. See\ndiff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt\nindex 86b3015..efbe379 100644\n--- a/Documentation/git-bisect-lk2009.txt\n+++ b/Documentation/git-bisect-lk2009.txt\n@@ -971,7 +971,7 @@ logical change in each commit.\n The smaller the changes in your commit, the most effective \"git\n bisect\" will be. And you will probably need \"git bisect\" less in the\n first place, as small changes are easier to review even if they are\n-only reviewed by the commiter.\n+only reviewed by the committer.\n \n Another good idea is to have good commit messages. They can be very\n helpful to understand why some changes were made.\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex c28603e..42fb1f5 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -130,11 +130,11 @@ OPTIONS\n \tUsually recording a commit that has the exact same tree as its\n \tsole parent commit is a mistake, and the command prevents you\n \tfrom making such a commit.  This option bypasses the safety, and\n-\tis primarily for use by foreign scm interface scripts.\n+\tis primarily for use by foreign SCM interface scripts.\n \n --allow-empty-message::\n        Like --allow-empty this command is primarily for use by foreign\n-       scm interface scripts. It allows you to create a commit with an\n+       SCM interface scripts. It allows you to create a commit with an\n        empty commit message without using plumbing commands like\n        linkgit:git-commit-tree[1].\n \ndiff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt\nindex 8bcd875..608cd63 100644\n--- a/Documentation/git-cvsimport.txt\n+++ b/Documentation/git-cvsimport.txt\n@@ -188,7 +188,7 @@ ISSUES\n ------\n Problems related to timestamps:\n \n- * If timestamps of commits in the cvs repository are not stable enough\n+ * If timestamps of commits in the CVS repository are not stable enough\n    to be used for ordering commits changes may show up in the wrong\n    order.\n  * If any files were ever \"cvs import\"ed more than once (e.g., import of\n@@ -201,7 +201,7 @@ Problems related to branches:\n \n  * Branches on which no commits have been made are not imported.\n  * All files from the branching point are added to a branch even if\n-   never added in cvs.\n+   never added in CVS.\n  * This applies to files added to the source branch *after* a daughter\n    branch was created: if previously no commit was made on the daughter\n    branch they will erroneously be added to the daughter branch in git.\ndiff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt\nindex 7004dd2..5ee9f69 100644\n--- a/Documentation/git-cvsserver.txt\n+++ b/Documentation/git-cvsserver.txt\n@@ -366,8 +366,8 @@ CRLF Line Ending Conversions\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n By default the server leaves the '-k' mode blank for all files,\n-which causes the cvs client to treat them as a text files, subject\n-to crlf conversion on some platforms.\n+which causes the CVS client to treat them as a text files, subject\n+to CRLF conversion on some platforms.\n \n You can make the server use the end-of-line conversion attributes to\n set the '-k' modes for files by setting the `gitcvs.usecrlfattr`\ndiff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt\nindex 6904739..11bf251 100644\n--- a/Documentation/git-hash-object.txt\n+++ b/Documentation/git-hash-object.txt\n@@ -49,7 +49,7 @@ OPTIONS\n \n --no-filters::\n \tHash the contents as is, ignoring any input filter that would\n-\thave been chosen by the attributes mechanism, including crlf\n+\thave been chosen by the attributes mechanism, including CRLF\n \tconversion. If the file is read from standard input then this\n \tis always implied, unless the --path option is given.\n \ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 645f0c1..a9d287f 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -355,7 +355,7 @@ Keep changes in working tree while discarding some previous commits::\n Suppose you are working on something and you commit it, and then you\n continue working a bit more, but now you think that what you have in\n your working tree should be in another branch that has nothing to do\n-with what you commited previously. You can start a new branch and\n+with what you committed previously. You can start a new branch and\n reset it while keeping the changes in your work tree.\n +\n ------------\ndiff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt\nindex 3cd32d6..eb3d040 100644\n--- a/Documentation/gitrepository-layout.txt\n+++ b/Documentation/gitrepository-layout.txt\n@@ -16,7 +16,7 @@ You may find these things in your git repository (`.git`\n directory for a repository associated with your working tree, or\n `<project>.git` directory for a public 'bare' repository. It is\n also possible to have a working tree where `.git` is a plain\n-ascii file containing `gitdir: <path>`, i.e. the path to the\n+ASCII file containing `gitdir: <path>`, i.e. the path to the\n real git repository).\n \n objects::\ndiff --git a/Documentation/urls.txt b/Documentation/urls.txt\nindex 1dcd1e7..2890194 100644\n--- a/Documentation/urls.txt\n+++ b/Documentation/urls.txt\n@@ -25,7 +25,7 @@ The ssh and git protocols additionally support ~username expansion:\n - git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/\n - {startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/\n \n-For local respositories, also supported by git natively, the following\n+For local repositories, also supported by git natively, the following\n syntaxes may be used:\n \n - /path/to/repo.git/\n-- \n1.7.1.1\n"},{"id":"145824","messageId":"1279574238-16649-2-git-send-email-ville.skytta@iki.fi","threadId":"24438","inReplyTo":"1279574238-16649-1-git-send-email-ville.skytta@iki.fi","subject":"[PATCH 2/2] Improve \"move the whole tree into a subdirectory\" example.","fromName":"Ville Skyttä","fromEmail":"ville.skytta@iki.fi","sentAt":"2010-07-19T21:17:18Z","receivedAt":"2010-07-19T21:17:18Z","isPatch":true,"sender":{"key":"ville.skytta@iki.fi","avatar":"https://avatars.githubusercontent.com/u/109152?v=4"},"body":"Using \"/\" as the sed substitution delimiter is less likely to clash\nwith desired subdirectory names than \"-\".\n---\n Documentation/git-filter-branch.txt |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt\nindex 020028c..a90e2dd 100644\n--- a/Documentation/git-filter-branch.txt\n+++ b/Documentation/git-filter-branch.txt\n@@ -354,11 +354,12 @@ git filter-branch ... C..H --not D\n git filter-branch ... D..H --not C\n ----------------------------------------\n \n-To move the whole tree into a subdirectory, or remove it from there:\n+To move the whole tree into a subdirectory named newsubdir, or remove\n+it from there:\n \n ---------------------------------------------------------------\n git filter-branch --index-filter \\\n-\t'git ls-files -s | sed \"s-\\t\\\"*-&newsubdir/-\" |\n+\t'git ls-files -s | sed \"s/\\t\\\"*/&newsubdir\\//\" |\n \t\tGIT_INDEX_FILE=$GIT_INDEX_FILE.new \\\n \t\t\tgit update-index --index-info &&\n \t mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD\n-- \n1.7.1.1\n"},{"id":"145829","messageId":"20100719231123.GA1708@burratino","threadId":"24438","inReplyTo":"1279574238-16649-1-git-send-email-ville.skytta@iki.fi","subject":"Re: [PATCH 1/2] Documentation spelling fixes.","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-07-19T23:11:24Z","receivedAt":"2010-07-19T23:11:24Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi Ville,\n\nVille Skyttä wrote:\n\n> ---\n\nIf this does not end up needing a re-roll, would it be okay for\nJunio (or whoever else picks up the patch) to forge your sign-off?\n(See \"Sign your work\" in Documentation/SubmittingPatches for what I\nmean.)\n\n> +++ b/Documentation/config.txt\n> @@ -418,7 +418,7 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.\n>  \n>  core.deltaBaseCacheLimit::\n>  \tMaximum number of bytes to reserve for caching base objects\n> -\tthat multiple deltafied objects reference.  By storing the\n> +\tthat multiple deltified objects reference.  By storing the\n\nHuh?  Maybe\n\n\tMaximum number of bytes to reserve for caching based objects\n\tthat might be referenced by multiple deltified objects.\n\nOr:\n\n\tAmount of memory (in bytes) to reserve for speeding up\n\tunpacking of deltified objects.  By storing entire\n\tdecompressed base objects in a cache, Git can avoid\n\tunpacking and decompressing frequently-used base objects\n\tmultiple times.\n\n> @@ -1275,7 +1275,7 @@ instaweb.local::\n>  \tbe bound to the local IP (127.0.0.1).\n>  \n>  instaweb.modulepath::\n> -\tThe module path for an apache httpd used by linkgit:git-instaweb[1].\n> +\tThe module path for an Apache httpd used by linkgit:git-instaweb[1].\n\nMaybe:\n\n\tDefault module path for linkgit:git-instaweb[1] to use\n\tinstead of /usr/lib/apache2/modules.  Only used if httpd\n\tis Apache.\n\n> +++ b/Documentation/git-cvsserver.txt\n> @@ -366,8 +366,8 @@ CRLF Line Ending Conversions\n>  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n>  \n>  By default the server leaves the '-k' mode blank for all files,\n> -which causes the cvs client to treat them as a text files, subject\n> +which causes the CVS client to treat them as a text files, subject\n\nShould we call the cvs(1) command \"the CVS client\"?  Maybe\n\"the cvs(1) client\" or something would be clearer, but I\ndon't see anything wrong with your choice.\n\n> -to crlf conversion on some platforms.\n> +to CRLF conversion on some platforms.\n\nThis term can be confusing, as we've seen in other contexts.\nMaybe:\n\n\tsubject to line-ending conversion on some platforms.\n\n> +++ b/Documentation/git-hash-object.txt\n> @@ -49,7 +49,7 @@ OPTIONS\n>  \n>  --no-filters::\n>  \tHash the contents as is, ignoring any input filter that would\n> -\thave been chosen by the attributes mechanism, including crlf\n> +\thave been chosen by the attributes mechanism, including CRLF\n>  \tconversion. If the file is read from standard input then this\n\nIt's called \"end-of-line conversion\" in gitattributes(5) now,\napparently.\n\nThe rest of this one looks good.  Thanks.\n"},{"id":"145843","messageId":"201007200905.29267.ville.skytta@iki.fi","threadId":"24438","inReplyTo":"20100719231123.GA1708@burratino","subject":"Re: [PATCH 1/2] Documentation spelling fixes.","fromName":"Ville Skyttä","fromEmail":"ville.skytta@iki.fi","sentAt":"2010-07-20T06:05:28Z","receivedAt":"2010-07-20T06:05:28Z","isPatch":true,"sender":{"key":"ville.skytta@iki.fi","avatar":"https://avatars.githubusercontent.com/u/109152?v=4"},"body":"On Tuesday 20 July 2010, Jonathan Nieder wrote:\n> Hi Ville,\n> \n> Ville Skyttä wrote:\n> > ---\n> \n> If this does not end up needing a re-roll, would it be okay for\n> Junio (or whoever else picks up the patch) to forge your sign-off?\n> (See \"Sign your work\" in Documentation/SubmittingPatches for what I\n> mean.)\n\nSure, sorry for missing that point.  Ditto for the 2/2 patch I sent.\n\nRegarding the rest of your comments, I did not seek to rephrase any docs, just \nfixed some obvious spelling errors and made use of some terms and \nabbreviations etc more consistent across the docs.  I have no objections to \nyour suggestions but then again they're a bit larger changes which are out of \nscope for this patch as far as I'm concerned, and could e.g. be made \nseparately afterwards.\n"},{"id":"145927","messageId":"7vk4opjtdo.fsf@alter.siamese.dyndns.org","threadId":"24438","inReplyTo":"1279574238-16649-2-git-send-email-ville.skytta@iki.fi","subject":"Re: [PATCH 2/2] Improve \"move the whole tree into a subdirectory\" example.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-07-21T05:28:35Z","receivedAt":"2010-07-21T05:28:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ville Skyttä <ville.skytta@iki.fi> writes:\n\n> Using \"/\" as the sed substitution delimiter is less likely to clash\n> with desired subdirectory names than \"-\".\n\nSign-off?\n\nThe standard substitution in a case like this where you want to avoid\nusing \"/\" is \"|\", not \"-\".\n\n> ---\n>  Documentation/git-filter-branch.txt |    5 +++--\n>  1 files changed, 3 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt\n> index 020028c..a90e2dd 100644\n> --- a/Documentation/git-filter-branch.txt\n> +++ b/Documentation/git-filter-branch.txt\n> @@ -354,11 +354,12 @@ git filter-branch ... C..H --not D\n>  git filter-branch ... D..H --not C\n>  ----------------------------------------\n>  \n> -To move the whole tree into a subdirectory, or remove it from there:\n> +To move the whole tree into a subdirectory named newsubdir, or remove\n> +it from there:\n>  \n>  ---------------------------------------------------------------\n>  git filter-branch --index-filter \\\n> -\t'git ls-files -s | sed \"s-\\t\\\"*-&newsubdir/-\" |\n> +\t'git ls-files -s | sed \"s/\\t\\\"*/&newsubdir\\//\" |\n>  \t\tGIT_INDEX_FILE=$GIT_INDEX_FILE.new \\\n>  \t\t\tgit update-index --index-info &&\n>  \t mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD\n> -- \n> 1.7.1.1\n"},{"id":"145928","messageId":"1279691312-31364-1-git-send-email-ville.skytta@iki.fi","threadId":"24438","inReplyTo":"7vk4opjtdo.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2] Improve \"move the whole tree into a subdirectory\" example.","fromName":"Ville Skyttä","fromEmail":"ville.skytta@iki.fi","sentAt":"2010-07-21T05:48:32Z","receivedAt":"2010-07-21T05:48:32Z","isPatch":true,"sender":{"key":"ville.skytta@iki.fi","avatar":"https://avatars.githubusercontent.com/u/109152?v=4"},"body":"Using \"|\" as the sed substitution delimiter is less likely to clash\nwith desired subdirectory names than \"-\".\n\nSigned-off-by: Ville Skyttä <ville.skytta@iki.fi>\n---\n Documentation/git-filter-branch.txt |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt\nindex 020028c..954d195 100644\n--- a/Documentation/git-filter-branch.txt\n+++ b/Documentation/git-filter-branch.txt\n@@ -354,11 +354,12 @@ git filter-branch ... C..H --not D\n git filter-branch ... D..H --not C\n ----------------------------------------\n \n-To move the whole tree into a subdirectory, or remove it from there:\n+To move the whole tree into a subdirectory named newsubdir, or remove\n+it from there:\n \n ---------------------------------------------------------------\n git filter-branch --index-filter \\\n-\t'git ls-files -s | sed \"s-\\t\\\"*-&newsubdir/-\" |\n+\t'git ls-files -s | sed \"s|\\t\\\"*|&newsubdir/|\" |\n \t\tGIT_INDEX_FILE=$GIT_INDEX_FILE.new \\\n \t\t\tgit update-index --index-info &&\n \t mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD\n-- \n1.7.1.1\n"}]}