Commit ccf497de authored by Miklos Vajna's avatar Miklos Vajna Committed by Junio C Hamano

git-svn documentation: fix typo in 'rebase vs. pull/merge' section

Signed-off-by: default avatarMiklos Vajna <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 90dce515
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment