Code

git-svn documentation: fix typo in 'rebase vs. pull/merge' section
authorMiklos Vajna <vmiklos@frugalware.org>
Sat, 20 Jun 2009 11:27:15 +0000 (13:27 +0200)
committerJunio 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>
Documentation/git-svn.txt

index 5d6d30f764a7bca813295461104c8f6f46ad0e35..b6577dd4c480291fb6e51c6c1cfc92d0f4dc8796 100644 (file)
@@ -541,7 +541,7 @@ pulled or merged from.  This is because the author favored
 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.