summaryrefslogtreecommitdiff
path: root/Documentation/git-svn.txt
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-08-26 07:01:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-26 07:59:29 (GMT)
commitb22d449721b22f6ec090f22c418ae6b0a560f78d (patch)
tree49cd4fabbcef51bc387107bee09f1b49a6d9a7dc /Documentation/git-svn.txt
parent2e93115ed84901fb8ee8447a1baf37cd8c343d8e (diff)
downloadgit-b22d449721b22f6ec090f22c418ae6b0a560f78d.zip
git-b22d449721b22f6ec090f22c418ae6b0a560f78d.tar.gz
git-b22d449721b22f6ec090f22c418ae6b0a560f78d.tar.bz2
git-svn: add the 'dcommit' command
This is a high-level wrapper around the 'commit-diff' command and used to produce cleaner history against the mirrored repository through rebase/reset usage. It's basically a more polished version of this: for i in `git rev-list --no-merges remotes/git-svn..HEAD | tac`; do git-svn commit-diff $i~1 $i done git reset --hard remotes/git-svn Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-svn.txt')
-rw-r--r--Documentation/git-svn.txt27
1 files changed, 27 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 2fa5e94..b7b63f7 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -54,6 +54,15 @@ remotes/git-svn.
See '<<fetch-args,Additional Fetch Arguments>>' if you are interested in
manually joining branches on commit.
+'dcommit'::
+ Commit all diffs from the current HEAD directly to the SVN
+ repository, and then rebase or reset (depending on whether or
+ not there is a diff between SVN and HEAD). It is recommended
+ that you run git-svn fetch and rebase (not pull) your commits
+ against the latest changes in the SVN repository.
+ This is advantageous over 'commit' (below) because it produces
+ cleaner, more linear history.
+
'commit'::
Commit specified commit or tree objects to SVN. This relies on
your imported fetch data being up-to-date. This makes
@@ -157,6 +166,24 @@ after the authors-file is modified should continue operation.
repo-config key: svn.authors-file
+-m::
+--merge::
+-s<strategy>::
+--strategy=<strategy>::
+
+These are only used with the 'dcommit' command.
+
+Passed directly to git-rebase when using 'dcommit' if a
+'git-reset' cannot be used (see dcommit).
+
+-n::
+--dry-run::
+
+This is only used with the 'dcommit' command.
+
+Print out the series of git arguments that would show
+which diffs would be committed to SVN.
+
--
ADVANCED OPTIONS