path: root/README
diff options
authorJonas Smedegaard <>2007-11-02 14:26:54 +0100
committerJonas Smedegaard <>2007-11-02 14:26:54 +0100
commit505e184a4a08a935f1f2bfb0bb9e7db3cd8b1ff8 (patch)
tree7727b37f719b501817edd5b9d972bb1072f398b5 /README
parent46e6968649c73ea4c4118c8535bb4fc238ee9384 (diff)
Replace unneeded and problematic git rebase with git pull (now that I have figured out how to pull from third party).
Diffstat (limited to 'README')
1 files changed, 3 insertions, 5 deletions
diff --git a/README b/README
index 289b52d..5280f86 100644
--- a/README
+++ b/README
@@ -47,13 +47,11 @@ once, not on subsequent pushes) - like this:
git config remote.origin.url git-reference-to-public-repository
git push --all
-To resyncronize an older fork of the repository, re-applying local changes on
-top of the newer upstream GIT source, do like this from within your local
-forked repository:
+To resyncronize an older fork of the repository with newer upstream changes, do
+like this (skip first command on subsequent updates):
git remote add ikiwiki
- git fetch ikiwiki
- git rebase ikiwiki/master
+ git pull ikiwiki master