Skip to content

Commit

Permalink
Use “their” instead of “his” (#1360)
Browse files Browse the repository at this point in the history
Use “their” instead of “his”
  • Loading branch information
ben authored Jan 16, 2020
2 parents a520f64 + d630140 commit aabe621
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion book/05-distributed-git/sections/distributed-workflows.asc
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ This is a variant of a multiple-repository workflow.
It's generally used by huge projects with hundreds of collaborators; one famous example is the Linux kernel.
Various integration managers are in charge of certain parts of the repository; they're called _lieutenants_.
All the lieutenants have one integration manager known as the benevolent dictator.
The benevolent dictator pushes from his directory to a reference repository from which all the collaborators need to pull.
The benevolent dictator pushes from their directory to a reference repository from which all the collaborators need to pull.
The process works like this (see <<wfdiag_c>>):

1. Regular developers work on their topic branch and rebase their work on top of `master`.
Expand Down
2 changes: 1 addition & 1 deletion book/07-git-tools/sections/submodules.asc
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ Submodule DbConnector c3f01dc..c87d55d:
Git will by default try to update *all* of your submodules when you run `git submodule update --remote` so if you have a lot of them, you may want to pass the name of just the submodule you want to try to update.

===== Pulling Upstream Changes from the Project Remote
Let's now step into the shoes of your collaborator, who has his own local clone of the MainProject repository.
Let's now step into the shoes of your collaborator, who has their own local clone of the MainProject repository.
Simply executing `git pull` to get your newly committed changes is not enough:

[source,console]
Expand Down

0 comments on commit aabe621

Please sign in to comment.