diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:39:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:39:23 +0900 |
| commit | 88bf5716b2ea27d90ae93a2f12525a0e143e3b39 (patch) | |
| tree | 0ddd74fc574f9dc6ccd7667437b0f60b5fb6a94a /git-rerere.html | |
| parent | bc39b7db11be3ba4e93e34f706b8a774e523bf1b (diff) | |
| download | git-htmldocs-88bf5716b2ea27d90ae93a2f12525a0e143e3b39.tar.gz | |
Autogenerated HTML docs for v2.14.1-536-g68672
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rerere.html b/git-rerere.html index d9dcd4c6e..0d7c5954c 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -966,7 +966,7 @@ development on the topic branch:</p></div> o---o---o---*---o---o---o---o master</code></pre>
</div></div>
<div class="paragraph"><p>you could run <code>git rebase master topic</code>, to bring yourself
-up-to-date before your topic is ready to be sent upstream.
+up to date before your topic is ready to be sent upstream.
This would result in falling back to a three-way merge, and it
would conflict the same way as the test merge you resolved earlier.
<em>git rerere</em> will be run by <em>git rebase</em> to help you resolve this
@@ -983,7 +983,7 @@ conflict.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-03-23 14:31:16 PDT
+Last updated 2017-09-10 17:38:46 JST
</div>
</div>
</body>
|