diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:32:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:32:19 -0700 |
| commit | 14e6683c9ffe288fd03fe38170e3d255056a7841 (patch) | |
| tree | a3248ef8aa66bb4132fd6442a25d39a151b8173b /gitworkflows.html | |
| parent | 49bcf742a2710071f132cc7efcad8c4f4d7f0984 (diff) | |
| download | git-htmldocs-14e6683c9ffe288fd03fe38170e3d255056a7841.tar.gz | |
Autogenerated HTML docs for v2.18.0-rc2-76-g242ba
Diffstat (limited to 'gitworkflows.html')
| -rw-r--r-- | gitworkflows.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitworkflows.html b/gitworkflows.html index 94fbb7cc5..e1c7a2e71 100644 --- a/gitworkflows.html +++ b/gitworkflows.html @@ -852,7 +852,7 @@ the unstable branch into the stable one. Hence the following:</p></div> <div class="exampleblock">
<div class="title">Rule: Merge upwards</div>
<div class="content">
-<div class="paragraph"><p>Always commit your fixes to the oldest supported branch that require
+<div class="paragraph"><p>Always commit your fixes to the oldest supported branch that requires
them. Then (periodically) merge the integration branches upwards into each
other.</p></div>
</div></div>
@@ -1230,7 +1230,7 @@ other options.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-06-18 11:31:52 PDT
</div>
</div>
</body>
|