From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 24 Jan 2008 18:43:44 +0000 (-0500)
Subject: document how to make it rebase
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/19b8dc57315fc6b99162be53cd3c937552babf49

document how to make it rebase
---

diff --git a/lib/git-svn b/lib/git-svn
index 416a2f9..d1e32d8 100644
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -3,6 +3,17 @@
 # To make mr use this file, add a line like this inside the [DEFAULT]
 # section of your ~/.mrconfig
 #include = cat /usr/share/mr/git-svn
+#
+# Note that by default this makes mr update do a git-svn fetch.
+# Some might prefer it to do a git-svn rebase, if you do, you can
+# configure that as follows in your ~/.mrconfig:
+#git_svn_update = git-svn rebase
+git_svn_update = git-svn fetch
+git_svn_status = git status "$@" || true
+git_svn_commit = git-svn dcommit
+git_svn_record = git commit -a "$@"
+git_svn_diff = git diff "$@"
+git_svn_log = git-svn log "$@"
 
 git_test =
 	test -d "$MR_REPO"/.git &&
@@ -20,11 +31,4 @@ git_svn_register =
 	echo "Registering git-svn url: $url in $MR_CONFIG"
 	mr -c "$MR_CONFIG" config "`pwd`" checkout="git-svn clone '$url' '$MR_REPO'"
 
-git_svn_update = git-svn fetch
-git_svn_status = git status "$@" || true
-git_svn_commit = git-svn dcommit
-git_svn_record = git commit -a "$@"
-git_svn_diff = git diff "$@"
-git_svn_log = git-svn log "$@"
-
 # vim:sw=8:sts=0:ts=8:noet