* [PATCH] git-svn documentation: fix typo in 'rebase vs. pull/merge' section
@ 2009-06-20 11:27 Miklos Vajna
0 siblings, 0 replies; only message in thread
From: Miklos Vajna @ 2009-06-20 11:27 UTC (permalink / raw)
To: Eric Wong; +Cc: Junio C Hamano, git
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
Documentation/git-svn.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index ca3fc3d..bb22d8e 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -623,7 +623,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.
--
1.6.2.5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-06-20 11:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-20 11:27 [PATCH] git-svn documentation: fix typo in 'rebase vs. pull/merge' section Miklos Vajna
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).