From db632b6a1377a3a3eebbaf80427d62066fbb5ee0 Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Tue, 29 Jun 2021 06:31:48 +0000 Subject: [PATCH] Use main as default branch in documentation Bug: 1118433 Change-Id: I55d4c1cecf881d39c3189ed4fa4ef71db6eede08 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2981113 Commit-Queue: Josip Sokcevic Reviewed-by: Dirk Pranke Reviewed-by: Robbie Iannucci --- man/html/depot_tools_tutorial.html | 52 +++++++++---------- man/html/git-drover.html | 2 +- man/html/git-map-branches.html | 4 +- man/html/git-map.html | 2 +- man/html/git-nav-downstream.html | 8 +-- man/html/git-nav-upstream.html | 10 ++-- man/html/git-new-branch.html | 18 +++---- man/html/git-reparent-branch.html | 2 +- man/html/git-squash-branch.html | 4 +- man/man1/git-drover.1 | 2 +- man/man1/git-map-branches.1 | 4 +- man/man1/git-map.1 | 2 +- man/man1/git-nav-downstream.1 | 8 +-- man/man1/git-nav-upstream.1 | 10 ++-- man/man1/git-new-branch.1 | 18 +++---- man/man1/git-reparent-branch.1 | 2 +- man/man1/git-squash-branch.1 | 4 +- man/man7/depot_tools_tutorial.7 | 52 +++++++++---------- man/src/demo_repo.sh | 6 +-- .../depot_tools_tutorial.demo.walkthrough.sh | 2 +- man/src/depot_tools_tutorial.txt | 18 +++---- man/src/git-drover.demo.common.sh | 4 +- man/src/git-drover.txt | 2 +- man/src/git-nav-downstream.demo.1.sh | 2 +- man/src/git-new-branch.txt | 4 +- man/src/git-reparent-branch.txt | 2 +- 26 files changed, 122 insertions(+), 122 deletions(-) diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html index 3a2a60c26..145b16c9a 100644 --- a/man/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -1051,7 +1051,7 @@ begin a new CL:

$ git new-branch <branch_name>

This will create and checkout a new branch named branch_name which will track -the default upstream branch (origin/master). See +the default upstream branch (origin/main). See git-new-branch(1) for more features.

Commit as many changes as you like to this branch. When you want to upload it for review, run:

@@ -1060,7 +1060,7 @@ for review, run:

$ git cl upload

This will take the diff of your branch against its upstream branch (in that -case origin/master), and will post it to the +case origin/main), and will post it to the Chromium code review site.

@@ -1139,9 +1139,9 @@ bearings. Fortunately, depot_tools has two tools to help you out:

*​ 7dcfe47 (​frozen_changes​) 2014-03-12 ~ FREEZE.unindexed * 4b0c180 2014-03-12 ~ modfile * 59a7cca 2014-03-12 ~ a deleted file -* 6bec695 (​origin/master​) 2014-03-11 ~ Add neat feature <(frozen_changes) +* 6bec695 (​origin/main​) 2014-03-11 ~ Add neat feature <(frozen_changes) * d15a38a 2014-03-11 ~ Epic README update -* d559894 (​master​) 2014-03-11 ~ Important upstream change +* d559894 (​main​) 2014-03-11 ~ Important upstream change | * 9c311fd (​cool_feature​) 2014-03-11 ~ Respond to CL comments | | * 2a1eeb2 (​subfeature​) 2014-03-11 ~ integrate with CoolService | | * d777af6 2014-03-11 ~ slick commenting action @@ -1156,11 +1156,11 @@ bearings. Fortunately, depot_tools has two tools to help you out:

$ git map-branches
-origin/master
+origin/main
   cool_feature
     subfeature
   frozen_changes *
-  master
+ main
@@ -1218,7 +1218,7 @@ you want to base the new one on (i.e. CL 1), and then run:

$ git new-branch --upstream_current <branch_name>

This will make a new branch which tracks the current branch as its upstream -(as opposed to origin/master). All changes you commit to this branch will be +(as opposed to origin/main). All changes you commit to this branch will be in addition to the previous branch, but when you git cl upload, you will only upload the diff for the dependent (child) branch. You may have as many branches nested in this fashion as you like.

@@ -1232,7 +1232,7 @@ it, or even based another branch off of that one. Or you discover that have two independent CLs that would actually be much better off as dependent CLs. In instances like these, you can check out the offending branch and use git-reparent-branch(1) to move it to track a different parent. Note that -this can also be used to move a branch from tracking origin/master to lkgr +this can also be used to move a branch from tracking origin/main to lkgr or vice versa.

@@ -1259,7 +1259,7 @@ It was a Domo-Kuun. 1 file changed, 1 insertion(+), 1 deletion(-) $ git map * 615ffa7 (HEAD -> fix_typo) 2014-04-10 ~ Fix terrible typo. -* beec6f4 (origin/master, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(fix_typo) +* beec6f4 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(fix_typo) * 41290e0 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds * a76fde7 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager. * 9de7a71 2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar. @@ -1268,7 +1268,7 @@ It was a Domo-Kuun. * 33a7a74 2014-04-10 ~ Always output seccomp error messages to stderr $ git status On branch fix_typo -Your branch is ahead of 'origin/master' by 1 commit. +Your branch is ahead of 'origin/main' by 1 commit. (use "git push" to publish your local commits) nothing to commit, working tree clean @@ -1276,7 +1276,7 @@ nothing to commit, working tree clean ... truncated output ...

While we wait for feedback, let's do something else.

$ git new-branch chap2
 $ git map-branches
-origin/master
+origin/main
   chap2 *
   fix_typo
 $ cat >> build/whitespace_file.txt <<EOF
@@ -1287,7 +1287,7 @@ when the fan was last cleaned.
 EOF
 $ git status
 On branch chap2
-Your branch is up to date with 'origin/master'.
+Your branch is up to date with 'origin/main'.
 
 Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
@@ -1299,7 +1299,7 @@ no changes added to commit (use "git add" and/or "git commit -a")

Someone on the code review pointed out that our typo-fix has a typo :( We're still working on 'chap2' but we really want to land 'fix_typo', so let's switch over and fix it.

$ git freeze
 $ git checkout fix_typo
 Switched to branch 'fix_typo'
-Your branch is ahead of 'origin/master' by 1 commit.
+Your branch is ahead of 'origin/main' by 1 commit.
   (use "git push" to publish your local commits)
 $ echo -e '/Kuun\ns/Kuun/Kun\nwq' | ed build/whitespace_file.txt
 1501
@@ -1330,7 +1330,7 @@ It was a Domo-Banana| * 2c0ad9c	 (HEAD -> fix_typo) 2014-04-10 ~ Fix typo for good!
 | * 615ffa7	 2014-04-10 ~ Fix terrible typo.
 |/
-* beec6f4	 (origin/master, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(chap2, fix_typo)
+* beec6f4	 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(chap2, fix_typo)
 * 41290e0	 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds
 * a76fde7	 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager.
 * 9de7a71	 2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1338,11 +1338,11 @@ It was a Domo-Banana2250f53	 2014-04-10 ~ ozone: evdev: Filter devices by path
 * 33a7a74	 2014-04-10 ~ Always output seccomp error messages to stderr

Switch back to where we were using the nav* commands (for fun... git checkout would work here too)

$ git map-branches
-origin/master
+origin/main
   chap2
   fix_typo *
 $ git nav-upstream
-Note: switching to 'origin/master'.
+Note: switching to 'origin/main'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -1363,14 +1363,14 @@ HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
 $ git nav-downstream
 Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
 Switched to branch 'chap2'
-Your branch is ahead of 'origin/master' by 1 commit.
+Your branch is ahead of 'origin/main' by 1 commit.
   (use "git push" to publish your local commits)
 Please select a downstream branch
   0. chap2
   1. fix_typo
 Selection (0-1)[0]: 0
 $ git map-branches
-origin/master
+origin/main
   chap2 *
   fix_typo

Now we can pick up on chapter2 where we left off.

$ git thaw
@@ -1414,7 +1414,7 @@ EOF
 | * 2c0ad9c	 (fix_typo) 2014-04-10 ~ Fix typo for good!
 | * 615ffa7	 2014-04-10 ~ Fix terrible typo.
 |/
-* beec6f4	 (origin/master, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(chap2, fix_typo)
+* beec6f4	 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(chap2, fix_typo)
 * 41290e0	 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds
 * a76fde7	 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager.
 * 9de7a71	 2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1440,7 +1440,7 @@ EOF
 | * 2c0ad9c	 (fix_typo) 2014-04-10 ~ Fix typo for good!
 | * 615ffa7	 2014-04-10 ~ Fix terrible typo.
 |/
-* beec6f4	 (origin/master, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(chap2, fix_typo)
+* beec6f4	 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(chap2, fix_typo)
 * 41290e0	 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds
 * a76fde7	 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager.
 * 9de7a71	 2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1450,19 +1450,19 @@ EOF

We haven't updated the code in a while, so let's do that now.

$ git rebase-update
 Fetching origin
 From https://upstream
-   beec6f4..59cdb73  master     -> origin/master
+   beec6f4..59cdb73  main     -> origin/main
 Rebasing: chap2
 Rebasing: fix_typo
 Failed! Attempting to squash fix_typo ... Success!
 Rebasing: chap3
-Reparented chap3 to track origin/master (was tracking chap2)
+Reparented chap3 to track origin/main (was tracking chap2)
 Deleted branch fix_typo (was 5d26fec).
 Deleted branch chap2 (was 5d26fec).

Well look at that. The CQ landed our typo and chapter2 branches already and git rebase-update cleaned them up for us.

$ gclient sync
 ... truncated output ...
 $ git map
 * 93fe917	 (HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
-* 5d26fec	 (origin/master, origin/HEAD) 2014-04-10 ~ Finish chapter 2    <(chap3)
+* 5d26fec	 (origin/main, origin/HEAD) 2014-04-10 ~ Finish chapter 2    <(chap3)
 * df7fefb	 2014-04-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly.
 * 4b39cda	 2014-04-10 ~ Fix terrible typo.
 * 248c5b6	 2014-04-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
@@ -1478,7 +1478,7 @@ Deleted branch chap2 (was 5d26fec).

Someone on IRC mentions that they actually landed a chapter 3 already! We should pull their changes before continuing. Brace for a code conflict!

$ git rebase-update
 Fetching origin
 From https://upstream
-   5d26fec..59cdb73  master     -> origin/master
+   5d26fec..59cdb73  main     -> origin/main
 Rebasing: chap2
 ... lots of output, it's a conflict alright :(...
 $ git diff
@@ -1520,7 +1520,7 @@ chap3 up-to-date
 ... truncated output ...
 $ git map
 * 1cb4f5b	 (HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
-* 59cdb73	 (origin/master, origin/HEAD) 2014-04-10 ~ Refactor data interchange format.    <(chap3)
+* 59cdb73	 (origin/main, origin/HEAD) 2014-04-10 ~ Refactor data interchange format.    <(chap3)
 * 34676a3	 2014-04-10 ~ Ensure FS is exited for all not-in-same-page navigations.
 * 7d4784e	 2014-04-10 ~ Add best chapter2 ever!
 * 5d26fec	 2014-04-10 ~ Finish chapter 2
@@ -1581,7 +1581,7 @@ LKGR
 

 

   Last Known Good Revision. This is a git-tag(1) which tracks the last
-  version of origin/master which has passed the full set of testing on the
+  version of origin/main which has passed the full set of testing on the
   main Chromium waterfall.
 

 

diff --git a/man/html/git-drover.html b/man/html/git-drover.html
index 0c200987d..64ba9ba5e 100644
--- a/man/html/git-drover.html
+++ b/man/html/git-drover.html
@@ -966,7 +966,7 @@ Date:   Thu Apr 10 09:11:36 2014 +0000
 $ git cl land --bypass-hooks

If your cherrypick onto a release branch gets reverted, do not create a new -cherrypick from master onto that release branch. Instead, use the "Reland" +cherrypick from main onto that release branch. Instead, use the "Reland" button on the original cherrypick CL.

diff --git a/man/html/git-map-branches.html b/man/html/git-map-branches.html index f01416145..a733b9d47 100644 --- a/man/html/git-map-branches.html +++ b/man/html/git-map-branches.html @@ -851,7 +851,7 @@ assuming that the frozen_changes branch was currently checked out, 

$ git map-branches
 {NO_UPSTREAM}
   no_upstream
-origin/master
+origin/main
   cool_feature
     subfeature
   fixit
@@ -859,7 +859,7 @@ assuming that the frozen_changes branch was currently checked out,
 $ git map-branches -v
 {NO_UPSTREAM}                               
   no_upstream                               
-origin/master                               
+origin/main                               
   cool_feature         [ 4 commits            ]
     subfeature         [ 2 commits | behind 1 ]
   fixit                [ 2 commits            ]
diff --git a/man/html/git-map.html b/man/html/git-map.html
index 061427d66..8f5b3938d 100644
--- a/man/html/git-map.html
+++ b/man/html/git-map.html
@@ -848,7 +848,7 @@ configure this, use git config --add depot-tools.map-extra <value>| * 27abea4	 (spleen_tag) 2014-04-10 ~ Refactor spleen
 | * d8abe73	 2014-04-10 ~ Add widget
 |/
-* beec6f4	 (origin/master, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(cool_feature, fixit)
+* beec6f4	 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(cool_feature, fixit)
 * 41290e0	 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds
 * a76fde7	 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager.
 * 9de7a71	 2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar.
diff --git a/man/html/git-nav-downstream.html b/man/html/git-nav-downstream.html
index d45241ba1..68d18fbee 100644
--- a/man/html/git-nav-downstream.html
+++ b/man/html/git-nav-downstream.html
@@ -773,7 +773,7 @@ command will prompt you with a selection of the branches.

EXAMPLE

$ git map-branches
-origin/master
+origin/main
   cool_feature
     subfeature
   fixit
@@ -781,14 +781,14 @@ command will prompt you with a selection of the branches.
$ git nav-downstream Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes Switched to branch 'cool_feature' -Your branch is ahead of 'origin/master' by 4 commits. +Your branch is ahead of 'origin/main' by 4 commits. (use "git push" to publish your local commits) Please select a downstream branch 0. cool_feature 1. fixit Selection (0-1)[0]: 0 $ git map-branches -origin/master +origin/main cool_feature * subfeature fixit @@ -799,7 +799,7 @@ Your branch and 'cool_feature' have diverged, and have 2 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours) $ git map-branches -origin/master +origin/main cool_feature subfeature * fixit diff --git a/man/html/git-nav-upstream.html b/man/html/git-nav-upstream.html index 5be5505e7..0e8acd1a0 100644 --- a/man/html/git-nav-upstream.html +++ b/man/html/git-nav-upstream.html @@ -771,23 +771,23 @@ checks that out.

EXAMPLE

$ git map-branches
-origin/master
+origin/main
   cool_feature
     subfeature *
   fixit
     frozen_branch
 $ git nav-upstream
 Switched to branch 'cool_feature'
-Your branch is ahead of 'origin/master' by 4 commits.
+Your branch is ahead of 'origin/main' by 4 commits.
   (use "git push" to publish your local commits)
 $ git map-branches
-origin/master
+origin/main
   cool_feature *
     subfeature
   fixit
     frozen_branch
 $ git nav-upstream
-Note: switching to 'origin/master'.
+Note: switching to 'origin/main'.
 
 You are in 'detached HEAD' state. You can look around, make experimental <1>
 changes and commit them, and you can discard any commits you make in this
@@ -806,7 +806,7 @@ Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
 $ git map-branches
-origin/master
+origin/main
   cool_feature
     subfeature
   fixit
diff --git a/man/html/git-new-branch.html b/man/html/git-new-branch.html
index 7bb3cc1d2..8bc034d11 100644
--- a/man/html/git-new-branch.html
+++ b/man/html/git-new-branch.html
@@ -768,7 +768,7 @@ git-new-branch(1) Manual Page
 
DESCRIPTION

 

 
Creates a new branch. By default the new branch will track the configured
-upstream for the repo (defaults to origin/master). If one of the other options
+upstream for the repo (defaults to origin/main). If one of the other options
 is specified, it will track that other ref instead.

 
Conceptually, each branch in your repo represents one Change List (CL). If you
 have many independent CLs (i.e. the changes in one do not interact with/depend
@@ -840,7 +840,7 @@ new-branch --upstream_current <branch_name>.

 

 
depot-tools.upstream

 
This configures the default upstream for all new branches. If it is unset, it
-defaults to origin's default branch or origin/master if that can’t be found.
+defaults to origin's default branch or origin/main if that can’t be found.
 This is considered to be the root branch.

 

 

@@ -849,14 +849,14 @@ This is considered to be the root branch.

EXAMPLE

$ git map-branches -v
-origin/master                               
+origin/main                               
   cool_feature         [ ahead 4            ]
     subfeature         [ ahead 2 | behind 1 ]
   fixit                [ ahead 2            ]
     frozen_branch *    [ ahead 3            ]
 $ git new-branch independent_cl
 $ git map-branches -v
-origin/master                              
+origin/main                              
   cool_feature        [ ahead 4            ]
     subfeature        [ ahead 2 | behind 1 ]
   fixit               [ ahead 2            ]
@@ -864,7 +864,7 @@ This is considered to be the root branch.
independent_cl * $ vi foo && git add -A && git commit -m foo $ git map-branches -v -origin/master +origin/main cool_feature [ ahead 4 ] subfeature [ ahead 2 | behind 1 ] fixit [ ahead 2 ] @@ -872,7 +872,7 @@ This is considered to be the root branch.

independent_cl * [ ahead 1 ] $ git new-branch --upstream subfeature nested_cl $ git map-branches -v -origin/master +origin/main cool_feature [ ahead 4 ] subfeature [ ahead 2 | behind 1 ] <1> nested_cl * @@ -881,11 +881,11 @@ This is considered to be the root branch.

independent_cl [ ahead 1 ] $ git checkout cool_feature Switched to branch 'cool_feature' -Your branch is ahead of 'origin/master' by 4 commits. +Your branch is ahead of 'origin/main' by 4 commits. (use "git push" to publish your local commits) $ git new-branch --upstream_current cl_depends_on_cool_feature $ git map-branches -v -origin/master +origin/main cool_feature [ ahead 4 ] cl_depends_on_cool_feature * subfeature [ ahead 2 | behind 1 ] @@ -900,7 +900,7 @@ and have 2 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours) $ git new-branch --inject_current injected_cl $ git map-branches -v -origin/master +origin/main cool_feature [ ahead 4 ] <1> cl_depends_on_cool_feature injected_cl * diff --git a/man/html/git-reparent-branch.html b/man/html/git-reparent-branch.html index 3ec828d16..0630f94b2 100644 --- a/man/html/git-reparent-branch.html +++ b/man/html/git-reparent-branch.html @@ -802,7 +802,7 @@ case.

- Reparent to track the root branch. Defaults to origin/master. See + Reparent to track the root branch. Defaults to origin/main. See git-new-branch(1)'s CONFIGURATION VARIABLES section..

diff --git a/man/html/git-squash-branch.html b/man/html/git-squash-branch.html index b42a84f24..5c6cd9bf9 100644 --- a/man/html/git-squash-branch.html +++ b/man/html/git-squash-branch.html @@ -814,7 +814,7 @@ verify that the conflict diff is what you expected (and then skip it with | * 27abea4 (spleen_tag) 2014-04-10 ~ Refactor spleen | * d8abe73 2014-04-10 ~ Add widget |/ -* beec6f4 (origin/master, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(cool_feature, fixit) +* beec6f4 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(cool_feature, fixit) * 41290e0 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds * a76fde7 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager. * 9de7a71 2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar. @@ -834,7 +834,7 @@ verify that the conflict diff is what you expected (and then skip it with | * 27abea4 (spleen_tag) 2014-04-10 ~ Refactor spleen | * d8abe73 2014-04-10 ~ Add widget |/ -* beec6f4 (origin/master, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(cool_feature, fixit) +* beec6f4 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(cool_feature, fixit) * 41290e0 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds * a76fde7 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager. * 9de7a71 2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar. diff --git a/man/man1/git-drover.1 b/man/man1/git-drover.1 index 86040c7be..7a84be185 100644 --- a/man/man1/git-drover.1 +++ b/man/man1/git-drover.1 @@ -247,7 +247,7 @@ Date: Thu Apr 10 09:11:36 2014 +0000 .\} .sp .sp -If your cherrypick onto a release branch gets reverted, do not create a new cherrypick from master onto that release branch\&. Instead, use the "Reland" button on the original cherrypick CL\&. +If your cherrypick onto a release branch gets reverted, do not create a new cherrypick from main onto that release branch\&. Instead, use the "Reland" button on the original cherrypick CL\&. .RE .sp .it 1 an-trap diff --git a/man/man1/git-map-branches.1 b/man/man1/git-map-branches.1 index 88de44914..4ae07a26d 100644 --- a/man/man1/git-map-branches.1 +++ b/man/man1/git-map-branches.1 @@ -163,7 +163,7 @@ Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and \fB$ git map\-branches\fR {NO_UPSTREAM} no_upstream -origin/master +origin/main cool_feature subfeature fixit @@ -171,7 +171,7 @@ origin/master $ git map\-branches \-v\fR {NO_UPSTREAM} no_upstream -origin/master +origin/main cool_feature [ 4 commits ] subfeature [ 2 commits | behind 1 ] fixit [ 2 commits ] diff --git a/man/man1/git-map.1 b/man/man1/git-map.1 index 73b4eba6a..57bc8f64a 100644 --- a/man/man1/git-map.1 +++ b/man/man1/git-map.1 @@ -151,7 +151,7 @@ Running \fIgit map\fR would result in an output something like: | * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget |/ -* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR +* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. diff --git a/man/man1/git-nav-downstream.1 b/man/man1/git-nav-downstream.1 index c0a4c992a..c7b5f8aea 100644 --- a/man/man1/git-nav-downstream.1 +++ b/man/man1/git-nav-downstream.1 @@ -47,7 +47,7 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out .\} .nf \fB$ git map\-branches\fR -\fBorigin/master +\fBorigin/main \fR cool_feature subfeature fixit @@ -55,14 +55,14 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out \fB$ git nav\-downstream\fR Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes Switched to branch \*(Aqcool_feature\*(Aq -Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&. +Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&. (use "git push" to publish your local commits) Please select a downstream branch 0\&. cool_feature 1\&. fixit Selection (0\-1)[0]: 0 \fB$ git map\-branches\fR -origin/master +origin/main \fB cool_feature * \fR subfeature fixit @@ -73,7 +73,7 @@ Your branch and \*(Aqcool_feature\*(Aq have diverged, and have 2 and 1 different commits each, respectively\&. (use "git pull" to merge the remote branch into yours) \fB$ git map\-branches\fR -origin/master +origin/main cool_feature \fB subfeature * \fR fixit diff --git a/man/man1/git-nav-upstream.1 b/man/man1/git-nav-upstream.1 index d8b5768ec..5aff9be65 100644 --- a/man/man1/git-nav-upstream.1 +++ b/man/man1/git-nav-upstream.1 @@ -47,23 +47,23 @@ git-nav-upstream \- Checkout the upstream branch of the currently checked out br .\} .nf \fB$ git map\-branches\fR -origin/master +origin/main cool_feature \fB subfeature * \fR fixit frozen_branch \fB$ git nav\-upstream\fR Switched to branch \*(Aqcool_feature\*(Aq -Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&. +Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&. (use "git push" to publish your local commits) \fB$ git map\-branches\fR -origin/master +origin/main \fB cool_feature * \fR subfeature fixit frozen_branch \fB$ git nav\-upstream\fR -Note: switching to \*(Aqorigin/master\*(Aq\&. +Note: switching to \*(Aqorigin/main\*(Aq\&. You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental \fB(1)\fR changes and commit them, and you can discard any commits you make in this @@ -82,7 +82,7 @@ Turn off this advice by setting config variable advice\&.detachedHead to false HEAD is now at beec6f4 Make ReflectorImpl use mailboxes \fB$ git map\-branches\fR -\fBorigin/master +\fBorigin/main \fR cool_feature subfeature fixit diff --git a/man/man1/git-new-branch.1 b/man/man1/git-new-branch.1 index 4ce7ed03d..5a84c716f 100644 --- a/man/man1/git-new-branch.1 +++ b/man/man1/git-new-branch.1 @@ -41,7 +41,7 @@ git-new-branch \- Create a new branch with correct tracking information\&. .sp .SH "DESCRIPTION" .sp -Creates a new branch\&. By default the new branch will track the configured upstream for the repo (defaults to \fIorigin/master\fR)\&. If one of the other options is specified, it will track that other ref instead\&. +Creates a new branch\&. By default the new branch will track the configured upstream for the repo (defaults to \fIorigin/main\fR)\&. If one of the other options is specified, it will track that other ref instead\&. .sp Conceptually, each branch in your repo represents one \fIChange List (CL)\fR\&. If you have many independent CLs (i\&.e\&. the changes in one do not interact with/depend on the changes in another), then you should create them as new branches tracking the default upstream (i\&.e\&. git new\-branch )\&. If you have features which depend on each other, you should create stacked branches using git new\-branch \-\-upstream_current \&. .SH "OPTIONS" @@ -80,7 +80,7 @@ The name for the new branch\&. .SH "CONFIGURATION VARIABLES" .SS "depot\-tools\&.upstream" .sp -This configures the default \fIupstream\fR for all new branches\&. If it is unset, it defaults to \fIorigin\fR\*(Aqs default branch or \fIorigin/master\fR if that can\(cqt be found\&. This is considered to be the \fIroot\fR branch\&. +This configures the default \fIupstream\fR for all new branches\&. If it is unset, it defaults to \fIorigin\fR\*(Aqs default branch or \fIorigin/main\fR if that can\(cqt be found\&. This is considered to be the \fIroot\fR branch\&. .SH "EXAMPLE" .sp @@ -90,14 +90,14 @@ This configures the default \fIupstream\fR for all new branches\&. If it is unse .\} .nf \fB$ git map\-branches \-v\fR -origin/master +origin/main cool_feature [ ahead 4 ] subfeature [ ahead 2 | behind 1 ] fixit [ ahead 2 ] \fB frozen_branch * [ ahead 3 ] $ git new\-branch independent_cl\fR \fB$ git map\-branches \-v\fR -\fBorigin/master +\fBorigin/main \fR cool_feature [ ahead 4 ] subfeature [ ahead 2 | behind 1 ] fixit [ ahead 2 ] @@ -105,7 +105,7 @@ $ git new\-branch independent_cl\fR \fB independent_cl * $ vi foo && git add \-A && git commit \-m foo\fR \fB$ git map\-branches \-v\fR -origin/master +origin/main cool_feature [ ahead 4 ] subfeature [ ahead 2 | behind 1 ] fixit [ ahead 2 ] @@ -113,7 +113,7 @@ origin/master \fB independent_cl * [ ahead 1 ] $ git new\-branch \-\-upstream subfeature nested_cl\fR \fB$ git map\-branches \-v\fR -origin/master +origin/main cool_feature [ ahead 4 ] \fB subfeature [ ahead 2 | behind 1 ] \fR\fB\fB(1)\fR\fR\fB nested_cl * @@ -122,11 +122,11 @@ origin/master independent_cl [ ahead 1 ] \fB$ git checkout cool_feature\fR Switched to branch \*(Aqcool_feature\*(Aq -Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&. +Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&. (use "git push" to publish your local commits) \fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR \fB$ git map\-branches \-v\fR -origin/master +origin/main \fB cool_feature [ ahead 4 ] cl_depends_on_cool_feature * \fR subfeature [ ahead 2 | behind 1 ] @@ -141,7 +141,7 @@ and have 2 and 1 different commits each, respectively\&. (use "git pull" to merge the remote branch into yours) \fB$ git new\-branch \-\-inject_current injected_cl\fR \fB$ git map\-branches \-v\fR -origin/master +origin/main \fB cool_feature [ ahead 4 ] \fR\fB\fB(1)\fR\fR\fB cl_depends_on_cool_feature injected_cl * diff --git a/man/man1/git-reparent-branch.1 b/man/man1/git-reparent-branch.1 index a293f9e56..0b29cd193 100644 --- a/man/man1/git-reparent-branch.1 +++ b/man/man1/git-reparent-branch.1 @@ -61,7 +61,7 @@ Reparent to track lkgr\&. Reparent to track the \fIroot\fR branch\&. Defaults to -\fIorigin/master\fR\&. See +\fIorigin/main\fR\&. See \fBgit-new-branch\fR(1)\*(Aqs CONFIGURATION VARIABLES section\&.\&. .RE .SH "SUGGESTED ALIASES" diff --git a/man/man1/git-squash-branch.1 b/man/man1/git-squash-branch.1 index 383a8bf1d..5fa56f894 100644 --- a/man/man1/git-squash-branch.1 +++ b/man/man1/git-squash-branch.1 @@ -68,7 +68,7 @@ Optional message to use for the first line of the squashed commit\&. If omitted, | * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget |/ -* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR +* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. @@ -88,7 +88,7 @@ Optional message to use for the first line of the squashed commit\&. If omitted, | * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget |/ -* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR +* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. diff --git a/man/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7 index 242a8de1e..03ffa31db 100644 --- a/man/man7/depot_tools_tutorial.7 +++ b/man/man7/depot_tools_tutorial.7 @@ -369,7 +369,7 @@ Each CL corresponds exactly with a single branch in git\&. Any time you want to .\} .sp .sp -This will create and checkout a new branch named branch_name which will track the default upstream branch (origin/master)\&. See \fBgit-new-branch\fR(1) for more features\&. +This will create and checkout a new branch named branch_name which will track the default upstream branch (origin/main)\&. See \fBgit-new-branch\fR(1) for more features\&. .sp Commit as many changes as you like to this branch\&. When you want to upload it for review, run: .sp @@ -384,7 +384,7 @@ Commit as many changes as you like to this branch\&. When you want to upload it .\} .sp .sp -This will take the diff of your branch against its upstream branch (in that case origin/master), and will post it to the \m[blue]\fBChromium code review site\fR\m[]\&\s-2\u[5]\d\s+2\&. +This will take the diff of your branch against its upstream branch (in that case origin/main), and will post it to the \m[blue]\fBChromium code review site\fR\m[]\&\s-2\u[5]\d\s+2\&. .SH "UPDATING THE CODE" .sp Inevitably, you\(cqll want to pull in changes from the main Chromium repo\&. This is pretty easy with \fIdepot_tools\fR: @@ -437,9 +437,9 @@ Once you start to have more than one CL at a time, it can be easy to lose your b *\:\fB 7dcfe47 \fR (\:\fBfrozen_changes\fR\:) 2014\-03\-12 ~ FREEZE\&.unindexed * \fB4b0c180\fR 2014\-03\-12 ~ modfile * \fB59a7cca\fR 2014\-03\-12 ~ a deleted file -* \fB6bec695\fR (\:origin/master\:) 2014\-03\-11 ~ Add neat feature \fB<(frozen_changes)\fR +* \fB6bec695\fR (\:origin/main\:) 2014\-03\-11 ~ Add neat feature \fB<(frozen_changes)\fR * \fBd15a38a\fR 2014\-03\-11 ~ Epic README update -* \fBd559894\fR (\:\fBmaster\fR\:) 2014\-03\-11 ~ Important upstream change +* \fBd559894\fR (\:\fBmain\fR\:) 2014\-03\-11 ~ Important upstream change | * \fB9c311fd\fR (\:\fBcool_feature\fR\:) 2014\-03\-11 ~ Respond to CL comments | | * \fB2a1eeb2\fR (\:\fBsubfeature\fR\:) 2014\-03\-11 ~ integrate with CoolService | | * \fBd777af6\fR 2014\-03\-11 ~ slick commenting action @@ -462,11 +462,11 @@ Note that this example repo is in dire need of a \fBgit-rebase-update\fR(1)! .\} .nf \fB$ git map\-branches\fR -origin/master +origin/main cool_feature subfeature frozen_changes * - master + main .fi .if n \{\ .RE @@ -508,11 +508,11 @@ Like all of the other CLs we\(cqve created, we use \fBgit-new-branch\fR(1), but .\} .sp .sp -This will make a new branch which tracks the \fIcurrent\fR branch as its upstream (as opposed to \fIorigin/master\fR)\&. All changes you commit to this branch will be in addition to the previous branch, but when you git cl upload, you will only upload the diff for the dependent (child) branch\&. You may have as many branches nested in this fashion as you like\&. +This will make a new branch which tracks the \fIcurrent\fR branch as its upstream (as opposed to \fIorigin/main\fR)\&. All changes you commit to this branch will be in addition to the previous branch, but when you git cl upload, you will only upload the diff for the dependent (child) branch\&. You may have as many branches nested in this fashion as you like\&. .sp \fBgit-map\fR(1) and \fBgit-map-branches\fR(1) are particularly helpful when you have dependent branches\&. In addition, there are two helper commands which let you traverse your working copy up and down this tree of branches: \fBgit-nav-upstream\fR(1) and \fBgit-nav-downstream\fR(1)\&. .sp -Sometimes when dealing with dependent CLs, it turns out that you accidentally based a branch on the wrong upstream, but since then you\(cqve committed changes to it, or even based \fIanother\fR branch off of that one\&. Or you discover that you have two independent CLs that would actually be much better off as dependent CLs\&. In instances like these, you can check out the offending branch and use \fBgit-reparent-branch\fR(1) to move it to track a different parent\&. Note that this can also be used to move a branch from tracking origin/master to lkgr or vice versa\&. +Sometimes when dealing with dependent CLs, it turns out that you accidentally based a branch on the wrong upstream, but since then you\(cqve committed changes to it, or even based \fIanother\fR branch off of that one\&. Or you discover that you have two independent CLs that would actually be much better off as dependent CLs\&. In instances like these, you can check out the offending branch and use \fBgit-reparent-branch\fR(1) to move it to track a different parent\&. Note that this can also be used to move a branch from tracking origin/main to lkgr or vice versa\&. .SH "EXAMPLE WALKTHROUGH" .sp This section will demo what a typical workflow looks like when writing, updating, and committing multiple CLs\&. @@ -574,7 +574,7 @@ It was a Domo\-Kuun\&. 1 file changed, 1 insertion(+), 1 deletion(\-) \fB$ git map\fR * \fB615ffa7 \fR (HEAD \-> fix_typo) 2014\-04\-10 ~ Fix terrible typo\&. -* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(fix_typo)\fR +* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(fix_typo)\fR * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. @@ -583,7 +583,7 @@ It was a Domo\-Kuun\&. * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr \fB$ git status\fR On branch fix_typo -Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. +Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&. (use "git push" to publish your local commits) nothing to commit, working tree clean @@ -602,7 +602,7 @@ While we wait for feedback, let\*(Aqs do something else\&. .nf \fB$ git new\-branch chap2\fR \fB$ git map\-branches\fR -\fBorigin/master +\fBorigin/main chap2 * \fR fix_typo \fB$ cat >> build/whitespace_file\&.txt <\&.\&.\&." to update what will be committed) @@ -636,7 +636,7 @@ Someone on the code review pointed out that our typo\-fix has a typo :( We\*(Aqr \fB$ git freeze\fR \fB$ git checkout fix_typo\fR Switched to branch \*(Aqfix_typo\*(Aq -Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. +Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&. (use "git push" to publish your local commits) \fB$ echo \-e \*(Aq/Kuun\ens/Kuun/Kun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR 1501 @@ -678,7 +678,7 @@ Since we got lgtm, let the CQ land it\&. | * \fB2c0ad9c \fR (HEAD \-> fix_typo) 2014\-04\-10 ~ Fix typo for good! | * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&. |/ -* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(chap2, fix_typo)\fR +* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(chap2, fix_typo)\fR * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. @@ -697,11 +697,11 @@ Switch back to where we were using the nav* commands (for fun\&.\&.\&. git check .\} .nf \fB$ git map\-branches\fR -origin/master +origin/main chap2 \fB fix_typo * $ git nav\-upstream\fR -Note: switching to \*(Aqorigin/master\*(Aq\&. +Note: switching to \*(Aqorigin/main\*(Aq\&. You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental changes and commit them, and you can discard any commits you make in this @@ -722,14 +722,14 @@ HEAD is now at beec6f4 Make ReflectorImpl use mailboxes \fB$ git nav\-downstream\fR Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes Switched to branch \*(Aqchap2\*(Aq -Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. +Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&. (use "git push" to publish your local commits) Please select a downstream branch 0\&. chap2 1\&. fix_typo Selection (0\-1)[0]: 0 \fB$ git map\-branches\fR -origin/master +origin/main \fB chap2 * \fR fix_typo .fi @@ -784,7 +784,7 @@ EOF | * \fB2c0ad9c \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good! | * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&. |/ -* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(chap2, fix_typo)\fR +* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(chap2, fix_typo)\fR * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. @@ -832,7 +832,7 @@ EOF | * \fB2c0ad9c \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good! | * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&. |/ -* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(chap2, fix_typo)\fR +* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(chap2, fix_typo)\fR * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. @@ -853,12 +853,12 @@ We haven\*(Aqt updated the code in a while, so let\*(Aqs do that now\&. \fB$ git rebase\-update\fR Fetching origin From https://upstream - beec6f4\&.\&.59cdb73 master \-> origin/master + beec6f4\&.\&.59cdb73 main \-> origin/main Rebasing: chap2 Rebasing: fix_typo Failed! Attempting to squash fix_typo \&.\&.\&. Success! Rebasing: chap3 -Reparented chap3 to track origin/master (was tracking chap2) +Reparented chap3 to track origin/main (was tracking chap2) Deleted branch fix_typo (was 5d26fec)\&. Deleted branch chap2 (was 5d26fec)\&. .fi @@ -876,7 +876,7 @@ Well look at that\&. The CQ landed our typo and chapter2 branches already and gi \&.\&.\&. truncated output \&.\&.\&. \fB$ git map\fR * \fB93fe917 \fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3 -* \fB5d26fec \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Finish chapter 2\fB <(chap3)\fR +* \fB5d26fec \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Finish chapter 2\fB <(chap3)\fR * \fBdf7fefb \fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&. * \fB4b39cda \fR 2014\-04\-10 ~ Fix terrible typo\&. * \fB248c5b6 \fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&. @@ -903,7 +903,7 @@ Someone on IRC mentions that they actually landed a chapter 3 already! We should \fB$ git rebase\-update\fR Fetching origin From https://upstream - 5d26fec\&.\&.59cdb73 master \-> origin/master + 5d26fec\&.\&.59cdb73 main \-> origin/main Rebasing: chap2 \&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&. \fB$ git diff\fR @@ -967,7 +967,7 @@ chap3 up\-to\-date \&.\&.\&. truncated output \&.\&.\&. \fB$ git map\fR * \fB1cb4f5b \fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3 -* \fB59cdb73 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Refactor data interchange format\&.\fB <(chap3)\fR +* \fB59cdb73 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Refactor data interchange format\&.\fB <(chap3)\fR * \fB34676a3 \fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&. * \fB7d4784e \fR 2014\-04\-10 ~ Add best chapter2 ever! * \fB5d26fec \fR 2014\-04\-10 ~ Finish chapter 2 @@ -1016,7 +1016,7 @@ LKGR Last Known Good Revision\&. This is a \fBgit-tag\fR(1) which tracks the last version of -origin/master +origin/main which has passed the full set of testing on the \m[blue]\fBmain Chromium waterfall\fR\m[]\&\s-2\u[6]\d\s+2\&. .RE diff --git a/man/src/demo_repo.sh b/man/src/demo_repo.sh index 25bf4f0b0..db067580b 100755 --- a/man/src/demo_repo.sh +++ b/man/src/demo_repo.sh @@ -8,10 +8,10 @@ trap "rm -rf $TDIR" EXIT cd $TDIR silent git clone "$REMOTE" . silent git reset --hard stage_1 -silent git update-ref refs/remotes/origin/master stage_1 +silent git update-ref refs/remotes/origin/main stage_1 silent git tag -d $(git tag -l 'stage_*') -silent git checkout origin/master -silent git branch -d master +silent git checkout origin/main +silent git branch -d main silent git config color.ui always if [[ ! "$BLANK_DEMO" ]] diff --git a/man/src/depot_tools_tutorial.demo.walkthrough.sh b/man/src/depot_tools_tutorial.demo.walkthrough.sh index e84c229f5..0c0ca25c8 100755 --- a/man/src/depot_tools_tutorial.demo.walkthrough.sh +++ b/man/src/depot_tools_tutorial.demo.walkthrough.sh @@ -118,7 +118,7 @@ comment "We haven't updated the code in a while, so let's do that now." pcommand git rebase-update echo Fetching origin git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+' -silent git update-ref refs/remotes/origin/master stage_2 +silent git update-ref refs/remotes/origin/main stage_2 silent git tag -d $(git tag -l 'stage_*') git rebase-update --no-fetch diff --git a/man/src/depot_tools_tutorial.txt b/man/src/depot_tools_tutorial.txt index 2cbfcb9a0..ff325df7f 100644 --- a/man/src/depot_tools_tutorial.txt +++ b/man/src/depot_tools_tutorial.txt @@ -221,7 +221,7 @@ begin a new CL: ---- This will create and checkout a new branch named `branch_name` which will track -the default upstream branch (`origin/master`). See +the default upstream branch (`origin/main`). See linkgit:git-new-branch[1] for more features. Commit as many changes as you like to this branch. When you want to upload it @@ -233,7 +233,7 @@ for review, run: ---- This will take the diff of your branch against its upstream branch (in that -case origin/master), and will post it to the +case origin/main), and will post it to the link:https://chromium-review.googlesource.com[Chromium code review site]. @@ -302,9 +302,9 @@ bearings. Fortunately, 'depot_tools' has two tools to help you out: [white blue-background]##*##{zwsp}[blue-background red]** 7dcfe47 ** [green]##(##{zwsp}[aqua]**frozen_changes**{zwsp}[green]##)## [yellow]##2014-03-12## \~ FREEZE.unindexed * [red]**4b0c180** [yellow]##2014-03-12## \~ modfile * [red]**59a7cca** [yellow]##2014-03-12## \~ a deleted file -* [red]**6bec695** [green]##(##{zwsp}[red]##origin/master##{zwsp}[green]##)## [yellow]##2014-03-11## \~ Add neat feature [white]**<(frozen_changes)** +* [red]**6bec695** [green]##(##{zwsp}[red]##origin/main##{zwsp}[green]##)## [yellow]##2014-03-11## \~ Add neat feature [white]**<(frozen_changes)** * [red]**d15a38a** [yellow]##2014-03-11## \~ Epic README update -* [red]**d559894** [green]##(##{zwsp}[lime]**master**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Important upstream change +* [red]**d559894** [green]##(##{zwsp}[lime]**main**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Important upstream change [red]##|## * [red]**9c311fd** [green]##(##{zwsp}[lime]**cool_feature**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Respond to CL comments [red]##|## [green]##|## * [red]**2a1eeb2** [green]##(##{zwsp}[lime]**subfeature**{zwsp}[green]##)## [yellow]##2014-03-11## \~ integrate with CoolService [red]##|## [green]##|## * [red]**d777af6** [yellow]##2014-03-11## \~ slick commenting action @@ -320,11 +320,11 @@ Note that this example repo is in dire need of a linkgit:git-rebase-update[1]! [subs="quotes"] ---- [white]**$ git map-branches** -[red]#origin/master# +[red]#origin/main# [green]#cool_feature# [green]#subfeature# [aqua]#frozen_changes *# - [green]#master# + [green]#main# ---- linkgit:git-map[1]:: @@ -375,7 +375,7 @@ you want to base the new one on (i.e. CL 1), and then run: ---- This will make a new branch which tracks the 'current' branch as its upstream -(as opposed to 'origin/master'). All changes you commit to this branch will be +(as opposed to 'origin/main'). All changes you commit to this branch will be in addition to the previous branch, but when you `git cl upload`, you will only upload the diff for the dependent (child) branch. You may have as many branches nested in this fashion as you like. @@ -391,7 +391,7 @@ it, or even based 'another' branch off of that one. Or you discover that you have two independent CLs that would actually be much better off as dependent CLs. In instances like these, you can check out the offending branch and use linkgit:git-reparent-branch[1] to move it to track a different parent. Note that -this can also be used to move a branch from tracking `origin/master` to `lkgr` +this can also be used to move a branch from tracking `origin/main` to `lkgr` or vice versa. @@ -428,7 +428,7 @@ DEPS:: LKGR:: Last Known Good Revision. This is a linkgit:git-tag[1] which tracks the last - version of `origin/master` which has passed the full set of testing on the + version of `origin/main` which has passed the full set of testing on the link:http://build.chromium.org[main Chromium waterfall]. include::_footer.txt[] diff --git a/man/src/git-drover.demo.common.sh b/man/src/git-drover.demo.common.sh index cbe6576c7..9e3163408 100755 --- a/man/src/git-drover.demo.common.sh +++ b/man/src/git-drover.demo.common.sh @@ -11,9 +11,9 @@ drover_c() { tick 1000 } -silent git push origin refs/remotes/origin/master:refs/branch-heads/9999 +silent git push origin refs/remotes/origin/main:refs/branch-heads/9999 silent git config --add remote.origin.fetch \ +refs/branch-heads/*:refs/remotes/branch-heads/* silent git fetch origin -silent git checkout -B master origin/master +silent git checkout -B main origin/main diff --git a/man/src/git-drover.txt b/man/src/git-drover.txt index fab3cc2c6..6713ce5d2 100644 --- a/man/src/git-drover.txt +++ b/man/src/git-drover.txt @@ -82,7 +82,7 @@ Revert Example demo:2[] If your cherrypick onto a release branch gets reverted, do not create a new -cherrypick from master onto that release branch. Instead, use the "Reland" +cherrypick from main onto that release branch. Instead, use the "Reland" button on the original cherrypick CL. Manual Merge Example diff --git a/man/src/git-nav-downstream.demo.1.sh b/man/src/git-nav-downstream.demo.1.sh index d6a774348..7d9835af8 100755 --- a/man/src/git-nav-downstream.demo.1.sh +++ b/man/src/git-nav-downstream.demo.1.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash . demo_repo.sh -silent git checkout origin/master +silent git checkout origin/main run git map-branches pcommand git nav-downstream diff --git a/man/src/git-new-branch.txt b/man/src/git-new-branch.txt index c3d50efe9..0f761e2d3 100644 --- a/man/src/git-new-branch.txt +++ b/man/src/git-new-branch.txt @@ -19,7 +19,7 @@ DESCRIPTION ----------- Creates a new branch. By default the new branch will track the configured -upstream for the repo (defaults to 'origin/master'). If one of the other options +upstream for the repo (defaults to 'origin/main'). If one of the other options is specified, it will track that other ref instead. Conceptually, each branch in your repo represents one 'Change List (CL)'. If you @@ -62,7 +62,7 @@ depot-tools.upstream ~~~~~~~~~~~~~~~~~~~~ This configures the default 'upstream' for all new branches. If it is unset, it -defaults to 'origin''s default branch or 'origin/master' if that can't be found. +defaults to 'origin''s default branch or 'origin/main' if that can't be found. This is considered to be the 'root' branch. EXAMPLE diff --git a/man/src/git-reparent-branch.txt b/man/src/git-reparent-branch.txt index db33158e8..eb67d0674 100644 --- a/man/src/git-reparent-branch.txt +++ b/man/src/git-reparent-branch.txt @@ -40,7 +40,7 @@ OPTIONS Reparent to track lkgr. --root:: - Reparent to track the 'root' branch. Defaults to 'origin/master'. See + Reparent to track the 'root' branch. Defaults to 'origin/main'. See linkgit:git-new-branch[1]'s CONFIGURATION VARIABLES section..