From 505e184a4a08a935f1f2bfb0bb9e7db3cd8b1ff8 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 2 Nov 2007 14:26:54 +0100 Subject: Replace unneeded and problematic git rebase with git pull (now that I have figured out how to pull from third party). --- README | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'README') 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 http://source.jones.dk/ikiwiki.git - git fetch ikiwiki - git rebase ikiwiki/master + git pull ikiwiki master ---- -- cgit v1.2.3