{"thread":{"id":"19875","subject":"[PATCH] git-svn documentation: fix typo in 'rebase vs. pull/merge' section","startedAt":"2009-06-20T11:27:15Z","lastAt":"2009-06-20T11:27:15Z","messageCount":1,"participants":["Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"116669","messageId":"20090620112715.GB10895@genesis.frugalware.org","threadId":"19875","inReplyTo":null,"subject":"[PATCH] git-svn documentation: fix typo in 'rebase vs. pull/merge' section","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2009-06-20T11:27:15Z","receivedAt":"2009-06-20T11:27:15Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n Documentation/git-svn.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex ca3fc3d..bb22d8e 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -623,7 +623,7 @@ pulled or merged from.  This is because the author favored\n If you use `git svn set-tree A..B` to commit several diffs and you do\n not have the latest remotes/git-svn merged into my-branch, you should\n use `git svn rebase` to update your work branch instead of `git pull` or\n-`git merge`.  `pull`/`merge' can cause non-linear history to be flattened\n+`git merge`.  `pull`/`merge` can cause non-linear history to be flattened\n when committing into SVN, which can lead to merge commits reversing\n previous commits in SVN.\n \n-- \n1.6.2.5\n"}]}