summaryrefslogtreecommitdiffstats
path: root/SubmittingPatches.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-06 22:35:57 -0700
committerJunio C Hamano <gitster@pobox.com>2020-07-06 22:35:57 -0700
commita89117826695bd15a06ab893f088622d58d49b0f (patch)
tree70a28e4da17998aca0ba3e65532c146377dc655b /SubmittingPatches.html
parentcb66540f7a8e62233e4f403871e927e8de01bb3f (diff)
downloadgit-htmldocs-a89117826695bd15a06ab893f088622d58d49b0f.tar.gz
Autogenerated HTML docs for v2.27.0-343-g4a0fcf
Diffstat (limited to 'SubmittingPatches.html')
-rw-r--r--SubmittingPatches.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/SubmittingPatches.html b/SubmittingPatches.html
index d95e34a30..eaefe53b2 100644
--- a/SubmittingPatches.html
+++ b/SubmittingPatches.html
@@ -759,7 +759,7 @@ A bugfix should be based on <code>maint</code> in general. If the bug is not
<li>
<p>
A new feature should be based on <code>master</code> in general. If the new
- feature depends on a topic that is in <code>pu</code>, but not in <code>master</code>,
+ feature depends on a topic that is in <code>seen</code>, but not in <code>master</code>,
base your work on the tip of that topic.
</p>
</li>
@@ -774,7 +774,7 @@ Corrections and enhancements to a topic not yet in <code>master</code> should
<li>
<p>
In the exceptional case that a new feature depends on several topics
- not in <code>master</code>, start working on <code>next</code> or <code>pu</code> privately and send
+ not in <code>master</code>, start working on <code>next</code> or <code>seen</code> privately and send
out patches for discussion. Before the final merge, you may have to
wait until some of the dependent topics graduate to <code>master</code>, and
rebase your work.
@@ -789,7 +789,7 @@ Some parts of the system have dedicated maintainers with their own
</li>
</ul></div>
<div class="paragraph"><p>To find the tip of a topic branch, run <code>git log --first-parent
-master..pu</code> and look for the merge commit. The second parent of this
+master..seen</code> and look for the merge commit. The second parent of this
commit is the tip of the topic branch.</p></div>
</div>
<div class="sect2">
@@ -1209,7 +1209,7 @@ A topic branch is created with the patch and is merged to <code>next</code>,
</li>
</ol></div>
<div class="paragraph"><p>In any time between the (2)-(3) cycle, the maintainer may pick it up
-from the list and queue it to <code>pu</code>, in order to make it easier for
+from the list and queue it to <code>seen</code>, in order to make it easier for
people play with it without having to pick up and apply the patch to
their trees themselves.</p></div>
</div>
@@ -1224,7 +1224,7 @@ You can use Git itself to find out when your patch is merged in
master. <code>git pull --rebase</code> will automatically skip already-applied
patches, and will let you know. This works only if you rebase on top
of the branch in which your patch has been merged (i.e. it will not
- tell you if your patch is merged in pu if you rebase on top of
+ tell you if your patch is merged in <code>seen</code> if you rebase on top of
master).
</p>
</li>
@@ -1389,7 +1389,7 @@ this problem around.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-17 23:16:11 PDT
+ 2020-07-06 22:33:23 PDT
</div>
</div>
</body>