From 34a9b27280bb029e457a63f06070cf3e19f75de4 Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Sun, 26 Apr 2009 19:32:20 +0300 Subject: [PATCH] open-osd: svn_fetch3: Add comments on how to use This scripts assumes a specific git situation to work best. Comment on that. (After a long time I forget what to do so better write it down) Signed-off-by: Boaz Harrosh --- svn_fetch3.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svn_fetch3.sh b/svn_fetch3.sh index ca01dd1..6928b41 100755 --- a/svn_fetch3.sh +++ b/svn_fetch3.sh @@ -5,6 +5,12 @@ # from svn into current git HEAD. Note that this will always succeed and no # merge conflicts will ever exist since git-checkout files are over written by # new svn files +# +# For clean merge-less pull start with: (No additional open-osd code) +# []$ git checkout osc +# []$ git cherry-pick FOR_SVN_FETCH3 +# (Above is for missing .gitignore, without it will not work) +# osc branch now holds the new patches, cherry-rebase over master commit_txt=`pwd`/commit.txt start_rev=695