diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-08-25 19:48:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-26 04:26:26 (GMT) |
| commit | 2e93115ed84901fb8ee8447a1baf37cd8c343d8e (patch) | |
| tree | 897f0e00df4fb047c6ae548cc5b8202b51684c21 | |
| parent | 5a990e45f920b50aa6b81823120223fb50f56d97 (diff) | |
| download | git-2e93115ed84901fb8ee8447a1baf37cd8c343d8e.zip git-2e93115ed84901fb8ee8447a1baf37cd8c343d8e.tar.gz git-2e93115ed84901fb8ee8447a1baf37cd8c343d8e.tar.bz2 | |
git-svn: recommend rebase for syncing against an SVN repo
Does this make sense to other git-svn users out there?
pull can give funky history unless you understand how git-svn works
internally, which users should not be expected to do.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-svn.txt | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 14bdef2..2fa5e94 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -235,12 +235,26 @@ Tracking and contributing to an Subversion managed-project: git-svn commit <tree-ish> [<tree-ish_2> ...] # Commit all the git commits from my-branch that don't exist in SVN: git-svn commit remotes/git-svn..my-branch -# Something is committed to SVN, pull the latest into your branch: - git-svn fetch && git pull . remotes/git-svn +# Something is committed to SVN, rebase the latest into your branch: + git-svn fetch && git rebase remotes/git-svn # Append svn:ignore settings to the default git exclude file: git-svn show-ignore >> .git/info/exclude ------------------------------------------------------------------------ +REBASE VS. PULL +--------------- + +Originally, git-svn recommended that the remotes/git-svn branch be +pulled from. This is because the author favored 'git-svn commit B' +to commit a single head rather than the 'git-svn commit A..B' notation +to commit multiple commits. + +If you use 'git-svn commit A..B' to commit several diffs and you do not +have the latest remotes/git-svn merged into my-branch, you should use +'git rebase' to update your work branch instead of 'git pull'. 'pull' +can cause non-linear history to be flattened when committing into SVN, +which can lead to merge commits reversing previous commits in SVN. + DESIGN PHILOSOPHY ----------------- Merge tracking in Subversion is lacking and doing branched development @@ -339,6 +353,10 @@ the possible corner cases (git doesn't do it, either). Renamed and copied files are fully supported if they're similar enough for git to detect them. +SEE ALSO +-------- +gitlink:git-rebase[1] + Author ------ Written by Eric Wong <normalperson@yhbt.net>. |