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.html | |
| parent | f43de609d47d6cec7e8d5e363f372455f59a7ecd (diff) | |
| download | git-htmldocs-0e88f3e399da078c8e389db57ca99569c3fdd3a8.tar.gz | |
Autogenerated HTML docs for v1.6.3.2-363-gc5764
Diffstat (limited to 'git-svn.html')
| -rw-r--r-- | git-svn.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.html b/git-svn.html index eb78ecf33..89a5068ec 100644 --- a/git-svn.html +++ b/git-svn.html @@ -1288,7 +1288,7 @@ pulled or merged from. This is because the author favored <div class="para"><p>If you use <tt>git svn set-tree A..B</tt> to commit several diffs and you do
not have the latest remotes/git-svn merged into my-branch, you should
use <tt>git svn rebase</tt> to update your work branch instead of <tt>git pull</tt> or
-<tt>git merge</tt>. <tt>pull</tt>/`merge' can cause non-linear history to be flattened
+<tt>git merge</tt>. <tt>pull</tt>/<tt>merge</tt> can cause non-linear history to be flattened
when committing into SVN, which can lead to merge commits reversing
previous commits in SVN.</p></div>
</div>
@@ -1378,7 +1378,7 @@ should be manually entered with a text-editor or using <em>git-config</em>.</p>< </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-05-21 16:27:28 UTC
+Last updated 2009-06-21 08:03:02 UTC
</div>
</div>
</body>
|