diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-06-21 08:03:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-06-21 08:03:25 +0000 |
| commit | 0e88f3e399da078c8e389db57ca99569c3fdd3a8 (patch) | |
| tree | c7ec4e6fd1a6c15ab346f0f203e5cf804607cd68 /git-svn.txt | |
| parent | f43de609d47d6cec7e8d5e363f372455f59a7ecd (diff) | |
| download | git-htmldocs-0e88f3e399da078c8e389db57ca99569c3fdd3a8.tar.gz | |
Autogenerated HTML docs for v1.6.3.2-363-gc5764
Diffstat (limited to 'git-svn.txt')
| -rw-r--r-- | git-svn.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.txt b/git-svn.txt index ca3fc3de1..bb22d8e71 100644 --- a/git-svn.txt +++ b/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. |