aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephenB <mail4stb@gmail.com>2011-01-06 19:06:51 +0000
committerEric Wong <normalperson@yhbt.net>2011-01-07 21:50:11 +0000
commit9cfdbf9bef8ba8694fde7e9c562b124d2f46d69d (patch)
treeeb134e602253caa53a1299928794a706ccc8fb5f
parentbc2d159421bb017edc7b8b8d6d5544e1c83073e4 (diff)
downloadgit-9cfdbf9bef8ba8694fde7e9c562b124d2f46d69d.tar.gz
git-9cfdbf9bef8ba8694fde7e9c562b124d2f46d69d.tar.xz
git svn: fix the final example in man page
'git-remote add' creates a remote.origin.fetch entry in the config, we want to replace this entry rather than add another one (which will cause 'git fetch' to error). This adds 'git config --remove-section remote.origin' after the fetch for encouraging users to only use "git svn" for future updates. [ew: rewording of commit message for present tense] Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: StephenB <mail4stb@gmail.com>
-rw-r--r--Documentation/git-svn.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 254d0441b..0ade2ce54 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -729,8 +729,11 @@ have each person clone that repository with 'git clone':
cd project
git init
git remote add origin server:/pub/project
- git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
+ git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
git fetch
+# Prevent fetch/pull from remote git server in the future,
+# we only want to use git svn for future updates
+ git config --remove-section remote.origin
# Create a local branch from one of the branches just fetched
git checkout -b master FETCH_HEAD
# Initialize 'git svn' locally (be sure to use the same URL and -T/-b/-t options as were used on server)