summaryrefslogtreecommitdiff
path: root/Documentation/git-svn.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-21 06:48:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-21 06:48:28 (GMT)
commitcd12f536129357d5347c1953db69bde68b5f46c9 (patch)
tree534f1f620a07c4d6d40eec15bc1178a06adef49b /Documentation/git-svn.txt
parent9b7dc7183528d42c46786a0be1acc58d4cd1f47a (diff)
parent4258c212ca2c3674be4b7e00a19db705eee77a48 (diff)
downloadgit-cd12f536129357d5347c1953db69bde68b5f46c9.zip
git-cd12f536129357d5347c1953db69bde68b5f46c9.tar.gz
git-cd12f536129357d5347c1953db69bde68b5f46c9.tar.bz2
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1: git-show-ref.txt: remove word and make consistent git-svn documentation: fix typo in 'rebase vs. pull/merge' section use xstrdup, not strdup in ll-merge.c
Diffstat (limited to 'Documentation/git-svn.txt')
-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 cda3389..d8bf7bf 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -599,7 +599,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.