From: Miklos Vajna Date: Sat, 20 Jun 2009 11:27:15 GMT Subject: [PATCH] git-svn documentation: fix typo in 'rebase vs. pull/merge' section Message-ID: <20090620112715.GB10895@genesis.frugalware.org> Signed-off-by: Miklos Vajna --- Documentation/git-svn.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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