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>
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 5d6d30f..b6577dd 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt
@@ -541,7 +541,7 @@ 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.