aboutsummaryrefslogtreecommitdiff
path: root/Documentation/MyFirstContribution.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-06 22:09:16 -0700
committerJunio C Hamano <gitster@pobox.com>2020-07-06 22:09:16 -0700
commit8a78e4d61588fe8e46dd7d27cb2d521b07f4a191 (patch)
treed986f3b24c2037e3fdbf999e558ce74030922bc7 /Documentation/MyFirstContribution.txt
parent0258ed1e08e7973f1d6829db8d33109851067a91 (diff)
parent6dca5dbf93ab8cfb82e626766d5e0e60a3da555d (diff)
downloadgit-8a78e4d61588fe8e46dd7d27cb2d521b07f4a191.tar.xz
Merge branch 'js/pu-to-seen'
The documentation and some tests have been adjusted for the recent renaming of "pu" branch to "seen". * js/pu-to-seen: tests: reference `seen` wherever `pu` was referenced docs: adjust the technical overview for the rename `pu` -> `seen` docs: adjust for the recent rename of `pu` to `seen`
Diffstat (limited to 'Documentation/MyFirstContribution.txt')
-rw-r--r--Documentation/MyFirstContribution.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index 427274df4d..d85c9b5143 100644
--- a/Documentation/MyFirstContribution.txt
+++ b/Documentation/MyFirstContribution.txt
@@ -1179,8 +1179,8 @@ look at the section below this one for some context.)
[[after-approval]]
=== After Review Approval
-The Git project has four integration branches: `pu`, `next`, `master`, and
-`maint`. Your change will be placed into `pu` fairly early on by the maintainer
+The Git project has four integration branches: `seen`, `next`, `master`, and
+`maint`. Your change will be placed into `seen` fairly early on by the maintainer
while it is still in the review process; from there, when it is ready for wider
testing, it will be merged into `next`. Plenty of early testers use `next` and
may report issues. Eventually, changes in `next` will make it to `master`,