summaryrefslogtreecommitdiff
path: root/Documentation/git-svn.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-21 06:48:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-21 06:48:21 (GMT)
commit4258c212ca2c3674be4b7e00a19db705eee77a48 (patch)
tree93e421911fc6e07f3dd18ea83aab9bd4ce2dd26e /Documentation/git-svn.txt
parentdfe50511c7e5ec2bc771c9a5f4c3318332a7744e (diff)
parentd4900ee48c70114ea3227f922d383de6b273fcde (diff)
downloadgit-4258c212ca2c3674be4b7e00a19db705eee77a48.zip
git-4258c212ca2c3674be4b7e00a19db705eee77a48.tar.gz
git-4258c212ca2c3674be4b7e00a19db705eee77a48.tar.bz2
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: 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 8d0c421..216c456 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -563,7 +563,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.