summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2009-06-20 11:27:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-21 04:20:51 (GMT)
commitccf497de97f9d22e55e9e5ae90b8a65503d48099 (patch)
treebc44cf890504f5cc93de301372304f5fb98f110a
parent90dce51584e908232ff279a6c2949ea9855dddf3 (diff)
downloadgit-ccf497de97f9d22e55e9e5ae90b8a65503d48099.zip
git-ccf497de97f9d22e55e9e5ae90b8a65503d48099.tar.gz
git-ccf497de97f9d22e55e9e5ae90b8a65503d48099.tar.bz2
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>
-rw-r--r--Documentation/git-svn.txt2
1 files changed, 1 insertions, 1 deletions
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 @@ 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.