Skip to content

Commit ccf497d

Browse files
Miklos Vajnagitster
authored andcommitted
git-svn documentation: fix typo in 'rebase vs. pull/merge' section
Signed-off-by: Miklos Vajna <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 90dce51 commit ccf497d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-svn.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ pulled or merged from. This is because the author favored
541541
If you use `git svn set-tree A..B` to commit several diffs and you do
542542
not have the latest remotes/git-svn merged into my-branch, you should
543543
use `git svn rebase` to update your work branch instead of `git pull` or
544-
`git merge`. `pull`/`merge' can cause non-linear history to be flattened
544+
`git merge`. `pull`/`merge` can cause non-linear history to be flattened
545545
when committing into SVN, which can lead to merge commits reversing
546546
previous commits in SVN.
547547

0 commit comments

Comments
 (0)