diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 23:50:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 23:50:17 -0700 |
| commit | c5764c095c2a563b657c1bd8f4a3e47bdeee14b0 (patch) | |
| tree | 2ea2c85a4fc13fbae8e6ad0bd6a8023f13d77f29 /Documentation/git-svn.txt | |
| parent | 2af202be3d2f128c6974290cabe13179c6462196 (diff) | |
| parent | 3ba4f3a9fc68ba4c5a0064107e8993c5fc5b684f (diff) | |
| download | git-c5764c095c2a563b657c1bd8f4a3e47bdeee14b0.tar.gz git-c5764c095c2a563b657c1bd8f4a3e47bdeee14b0.tar.xz | |
Merge branch 'maint'
* maint:
git-show-ref.txt: remove word and make consistent
git-svn documentation: fix typo in 'rebase vs. pull/merge' section
Diffstat (limited to 'Documentation/git-svn.txt')
| -rw-r--r-- | 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 ca3fc3de1..bb22d8e71 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. |