![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 42d7b82a3791421324be301689ecb108edd72b64..e157c6ab501a574b929bd73c427313874c3a3e90 100644 (file)
Print out the series of git arguments that would show
which diffs would be committed to SVN.
Print out the series of git arguments that would show
which diffs would be committed to SVN.
---first-parent::
-
-This is only used with the 'dcommit', 'rebase', 'log', 'find-rev' and
-'show-ignore' commands.
-
-These commands tries to detect the upstream subversion branch by means of
-the embedded 'git-svn-id' line in commit messages. When --first-parent is
-specified, git-svn only follows the first parent of each commit, effectively
-ignoring commits brought into the current branch through merge-operations.
-
--
ADVANCED OPTIONS
--
ADVANCED OPTIONS
DESIGN PHILOSOPHY
-----------------
Merge tracking in Subversion is lacking and doing branched development
DESIGN PHILOSOPHY
-----------------
Merge tracking in Subversion is lacking and doing branched development
-with Subversion is cumbersome as a result. git-svn does not do
-automated merge/branch tracking by default and leaves it entirely up to
-the user on the git side. git-svn does however follow copy
-history of the directory that it is tracking, however (much like
-how 'svn log' works).
+with Subversion can be cumbersome as a result. While git-svn can track
+copy history (including branches and tags) for repositories adopting a
+standard layout, it cannot yet represent merge history that happened
+inside git back upstream to SVN users. Therefore it is advised that
+users keep history as linear as possible inside git to ease
+compatibility with SVN (see the CAVEATS section below).
CAVEATS
-------
CAVEATS
-------