@matheusbsbs / matheus-bagliano / commits / 2eff14259e
Fork 0

Documentation/git-svn: clarify dcommit, rebase vs pull/merge

Clarify that dcommit creates a revision in SVN for every commit in git. Also, add 'merge' to the rebase vs pull section because git-merge is now a first-class UI. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>

Eric Wong committed Jan 6, 2007 at 17:53 UTC 2eff14259ea4035dc5f8a18f5998e88dd4da207e
1 file changed +18 -15
Documentation/git-svn.txt
+18 -15
@@ -53,11 +53,13 @@ See '<<fetch-args,Additional Fetch Arguments>>' if you are interested in
53 manually joining branches on commit.
54
55 'dcommit'::
56 - Commit all diffs from a specified head directly to the SVN
56 + Commit each diff from a specified head directly to the SVN
57 repository, and then rebase or reset (depending on whether or
58 - not there is a diff between SVN and head). It is recommended
59 - that you run git-svn fetch and rebase (not pull) your commits
60 - against the latest changes in the SVN repository.
58 + not there is a diff between SVN and head). This will create
59 + a revision in SVN for each commit in git.
60 + It is recommended that you run git-svn fetch and rebase (not
61 + pull or merge) your commits against the latest changes in the
62 + SVN repository.
63 An optional command-line argument may be specified as an
64 alternative to HEAD.
65 This is advantageous over 'set-tree' (below) because it produces
@@ -408,19 +410,20 @@ See also:
410 git-svn multi-init
411 ------------------------------------------------------------------------
412
411 -REBASE VS. PULL
412 ----------------
413 +REBASE VS. PULL/MERGE
414 +---------------------
415
416 Originally, git-svn recommended that the remotes/git-svn branch be
415 -pulled from. This is because the author favored 'git-svn set-tree B'
416 -to commit a single head rather than the 'git-svn set-tree A..B' notation
417 -to commit multiple commits.
418 -
419 -If you use 'git-svn set-tree A..B' to commit several diffs and you do not
420 -have the latest remotes/git-svn merged into my-branch, you should use
421 -'git rebase' to update your work branch instead of 'git pull'. 'pull'
422 -can cause non-linear history to be flattened when committing into SVN,
423 -which can lead to merge commits reversing previous commits in SVN.
417 +pulled or merged from. This is because the author favored
418 +'git-svn set-tree B' to commit a single head rather than the
419 +'git-svn set-tree A..B' notation to commit multiple commits.
420 +
421 +If you use 'git-svn set-tree A..B' to commit several diffs and you do
422 +not have the latest remotes/git-svn merged into my-branch, you should
423 +use 'git rebase' to update your work branch instead of 'git pull' or
424 +'git merge'. 'pull/merge' can cause non-linear history to be flattened
425 +when committing into SVN, which can lead to merge commits reversing
426 +previous commits in SVN.
427
428 DESIGN PHILOSOPHY
429 -----------------