{"thread":{"id":"11924","subject":"[PATCH 1/2] Documentation/git-svn.txt: Remove the hyphen from git-foo when quoted","startedAt":"2008-02-06T23:43:37Z","lastAt":"2008-02-06T23:43:37Z","messageCount":1,"participants":["Peter Harris"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"67731","messageId":"alpine.OSX.1.00.0802061835050.27901@mac.local","threadId":"11924","inReplyTo":null,"subject":"[PATCH 1/2] Documentation/git-svn.txt: Remove the hyphen from git-foo when quoted","fromName":"Peter Harris","fromEmail":"git@peter.is-a-geek.org","sentAt":"2008-02-06T23:43:37Z","receivedAt":"2008-02-06T23:43:37Z","isPatch":true,"sender":{"key":"git@peter.is-a-geek.org","avatar":null},"body":"\nThe git-foo forms are deprecated in favour of \"git foo\"\n\nSigned-off-by: Peter <git@peter.is-a-geek.org>\n---\n Documentation/git-svn.txt |   50 ++++++++++++++++++++++----------------------\n 1 files changed, 25 insertions(+), 25 deletions(-)\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex b1d527f..f94d0f9 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -97,20 +97,20 @@ COMMANDS\n \tThis fetches revisions from the SVN parent of the current HEAD\n \tand rebases the current (uncommitted to SVN) work against it.\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+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 \n-This accepts all options that 'git-svn fetch' and 'git-rebase'\n+This accepts all options that 'git svn fetch' and 'git rebase'\n accepts.  However '--fetch-all' only fetches from the current\n [svn-remote], and not all [svn-remote] definitions.\n \n-Like 'git-rebase'; this requires that the working tree be clean\n+Like 'git rebase'; this requires that the working tree be clean\n and have no uncommitted changes.\n \n -l;;\n --local;;\n-\tDo not fetch remotely; only run 'git-rebase' against the\n+\tDo not fetch remotely; only run 'git rebase' against the\n \tlast fetched commit from the upstream SVN.\n \n 'dcommit'::\n@@ -313,7 +313,7 @@ config key: svn.repackflags\n These are only used with the 'dcommit' and 'rebase' commands.\n \n Passed directly to git-rebase when using 'dcommit' if a\n-'git-reset' cannot be used (see dcommit).\n+'git reset' cannot be used (see dcommit).\n \n -n::\n --dry-run::\n@@ -366,7 +366,7 @@ If you lose your .git/svn/git-svn/.rev_db file, git-svn will not\n be able to rebuild it and you won't be able to fetch again,\n either.  This is fine for one-shot imports.\n \n-The 'git-svn log' command will not work on repositories using\n+The 'git svn log' command will not work on repositories using\n this, either.  Using this conflicts with the 'useSvmProps'\n option for (hopefully) obvious reasons.\n \n@@ -414,7 +414,7 @@ Tracking and contributing to the trunk of a Subversion-managed project:\n \n ------------------------------------------------------------------------\n # Clone a repo (like git clone):\n-\tgit-svn clone http://svn.foo.org/project/trunk\n+\tgit svn clone http://svn.foo.org/project/trunk\n # Enter the newly cloned directory:\n \tcd trunk\n # You should be on master branch, double-check with git-branch\n@@ -423,12 +423,12 @@ Tracking and contributing to the trunk of a Subversion-managed project:\n \tgit commit ...\n # Something is committed to SVN, rebase your local changes against the\n # latest changes in SVN:\n-\tgit-svn rebase\n+\tgit svn rebase\n # Now commit your changes (that were committed previously using git) to SVN,\n # as well as automatically updating your working HEAD:\n-\tgit-svn dcommit\n+\tgit svn dcommit\n # Append svn:ignore settings to the default git exclude file:\n-\tgit-svn show-ignore >> .git/info/exclude\n+\tgit svn show-ignore >> .git/info/exclude\n ------------------------------------------------------------------------\n \n Tracking and contributing to an entire Subversion-managed project\n@@ -436,7 +436,7 @@ Tracking and contributing to an entire Subversion-managed project\n \n ------------------------------------------------------------------------\n # Clone a repo (like git clone):\n-\tgit-svn clone http://svn.foo.org/project -T trunk -b branches -t tags\n+\tgit svn clone http://svn.foo.org/project -T trunk -b branches -t tags\n # View all branches and tags you have cloned:\n \tgit branch -r\n # Reset your master to trunk (or any other branch, replacing 'trunk'\n@@ -446,27 +446,27 @@ Tracking and contributing to an entire Subversion-managed project\n # of dcommit/rebase/show-ignore should be the same as above.\n ------------------------------------------------------------------------\n \n-The initial 'git-svn clone' can be quite time-consuming\n+The initial 'git svn clone' can be quite time-consuming\n (especially for large Subversion repositories). If multiple\n people (or one person with multiple machines) want to use\n git-svn to interact with the same Subversion repository, you can\n-do the initial 'git-svn clone' to a repository on a server and\n+do the initial 'git svn clone' to a repository on a server and\n have each person clone that repository with 'git clone':\n \n ------------------------------------------------------------------------\n # Do the initial import on a server\n-\tssh server \"cd /pub && git-svn clone http://svn.foo.org/project\n+\tssh server \"cd /pub && git svn clone http://svn.foo.org/project\n # Clone locally - make sure the refs/remotes/ space matches the server\n \tmkdir project\n \tcd project\n-\tgit-init\n+\tgit init\n \tgit remote add origin server:/pub/project\n \tgit config --add remote.origin.fetch=+refs/remotes/*:refs/remotes/*\n \tgit fetch\n # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)\n-\tgit-svn init http://svn.foo.org/project\n+\tgit svn init http://svn.foo.org/project\n # Pull the latest changes from Subversion\n-\tgit-svn rebase\n+\tgit svn rebase\n ------------------------------------------------------------------------\n \n REBASE VS. PULL/MERGE\n@@ -474,12 +474,12 @@ REBASE VS. PULL/MERGE\n \n Originally, git-svn recommended that the remotes/git-svn branch be\n pulled or merged from.  This is because the author favored\n-'git-svn set-tree B' to commit a single head rather than the\n-'git-svn set-tree A..B' notation to commit multiple commits.\n+'git svn set-tree B' to commit a single head rather than the\n+'git svn set-tree A..B' notation to commit multiple commits.\n \n-If you use 'git-svn set-tree A..B' to commit several diffs and you do\n+If you use 'git svn set-tree A..B' to commit several diffs and you do\n not have the latest remotes/git-svn merged into my-branch, you should\n-use 'git-svn rebase' to update your work branch instead of 'git pull' or\n+use 'git svn rebase' to update your work branch instead of 'git pull' or\n 'git merge'.  'pull/merge' can cause non-linear history to be flattened\n when committing into SVN, which can lead to merge commits reversing\n previous commits in SVN.\n@@ -504,14 +504,14 @@ operations between git repositories and branches.  The recommended\n method of exchanging code between git branches and users is\n git-format-patch and git-am, or just dcommiting to the SVN repository.\n \n-Running 'git-merge' or 'git-pull' is NOT recommended on a branch you\n+Running 'git merge' or 'git pull' is NOT recommended on a branch you\n plan to dcommit from.  Subversion does not represent merges in any\n reasonable or useful fashion; so users using Subversion cannot see any\n merges you've made.  Furthermore, if you merge or pull from a git branch\n that is a mirror of an SVN branch, dcommit may commit to the wrong\n branch.\n \n-'git-clone' does not clone branches under the refs/remotes/ hierarchy or\n+'git clone' does not clone branches under the refs/remotes/ hierarchy or\n any git-svn metadata, or config.  So repositories created and managed with\n using git-svn should use rsync(1) for cloning, if cloning is to be done\n at all.\n-- \n1.5.3.7\n"}]}