summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 90dce51)
raw | patch | inline | side by side (parent: 90dce51)
author | Miklos Vajna <vmiklos@frugalware.org> | |
Sat, 20 Jun 2009 11:27:15 +0000 (13:27 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 21 Jun 2009 04:20:51 +0000 (21:20 -0700) |
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-svn.txt | patch | blob | history |
index 5d6d30f764a7bca813295461104c8f6f46ad0e35..b6577dd4c480291fb6e51c6c1cfc92d0f4dc8796 100644 (file)
If you use `git svn set-tree A..B` to commit several diffs and you do
not have the latest remotes/git-svn merged into my-branch, you should
use `git svn rebase` to update your work branch instead of `git pull` or
-`git merge`. `pull`/`merge' can cause non-linear history to be flattened
+`git merge`. `pull`/`merge` can cause non-linear history to be flattened
when committing into SVN, which can lead to merge commits reversing
previous commits in SVN.