From ccf497de97f9d22e55e9e5ae90b8a65503d48099 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sat, 20 Jun 2009 13:27:15 +0200 Subject: [PATCH] git-svn documentation: fix typo in 'rebase vs. pull/merge' section Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- Documentation/git-svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 5d6d30f76..b6577dd4c 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -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. -- 2.26.2