Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
Documentation/git-svn.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to Documentation/git-svn.txt +1 −1
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index ca3fc3d..bb22d8e 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -623,7 +623,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.
--
1.6.2.5
Miklos Vajna