git-svn documentation: fix typo in 'rebase vs. pull/merge' section
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Miklos Vajna committed
Jun 20, 2009 at 13:27 UTC
ccf497de97f9d22e55e9e5ae90b8a65503d48099
1 file changed
+1
-1
Documentation/git-svn.txt
+1
-1
@@ -541,7 +541,7 @@ pulled or merged from. This is because the author favored
541
If you use `git svn set-tree A..B` to commit several diffs and you do
542
not have the latest remotes/git-svn merged into my-branch, you should
543
use `git svn rebase` to update your work branch instead of `git pull` or
544
-`git merge`. `pull`/`merge' can cause non-linear history to be flattened
544
+`git merge`. `pull`/`merge` can cause non-linear history to be flattened
545
when committing into SVN, which can lead to merge commits reversing
546
previous commits in SVN.
547