summaryrefslogtreecommitdiff
path: root/README.mv.txt
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-06-19 14:31:34 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-06-19 14:31:34 -0700
commit533361dcbbc53cf237c7768efdd4cb903b8c648d (patch)
tree5794d2ca7981e0d619fa92d0a271f399808f70d7 /README.mv.txt
parenta185fab9ff741a8f1da3eb8cc2aef6860338e986 (diff)
downloadserverdata-533361dcbbc53cf237c7768efdd4cb903b8c648d.tar.gz
serverdata-533361dcbbc53cf237c7768efdd4cb903b8c648d.tar.bz2
serverdata-533361dcbbc53cf237c7768efdd4cb903b8c648d.tar.xz
serverdata-533361dcbbc53cf237c7768efdd4cb903b8c648d.zip
Update submodule and add a git hook
Diffstat (limited to 'README.mv.txt')
-rw-r--r--README.mv.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.mv.txt b/README.mv.txt
index adca1793..1d2ce605 100644
--- a/README.mv.txt
+++ b/README.mv.txt
@@ -24,7 +24,7 @@ git submodule update lose changes in submodule and reset to upstream
git submodule update --merge merge changes in submodule from upstream
git submodule update --rebase rebase local changes on top of upstream
(use this, for the same reason you should use git pull --rebase instead of just git pull - but remember that it's dangerous)
-git submodules sync change the url of the submodule (when testing is deleted)
+git submodule sync change the url of the submodule (when testing is deleted)
git config --global url.git@gitorious.org:.pushInsteadOf git://gitorious.org
for people with push access: don't pull via ssh (which is slower anyway), required for submodules to work properly
git checkout HEAD^ -B master completely roll back the latest commit