Skip to content

Commit 5122fe0

Browse files
committed
Merge pull request #309 from SkypLabs/patch-1
use of gender-neutral pronoun 'they'
2 parents 12f0c8c + 505f592 commit 5122fe0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/03-git-branching/sections/rebasing.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ image::images/perils-of-rebasing-4.png[You merge in the same work again into a n
174174

175175
If you run a `git log` when your history looks like this, you'll see two commits that have the same author, date, and message, which will be confusing.
176176
Furthermore, if you push this history back up to the server, you'll reintroduce all those rebased commits to the central server, which can further confuse people.
177-
It's pretty safe to assume that the other developer doesn't want `C4` and `C6` to be in the history; that's why she rebased in the first place.
177+
It's pretty safe to assume that the other developer doesn't want `C4` and `C6` to be in the history; that's why they rebased in the first place.
178178

179179
[[_rebase_rebase]]
180180
==== Rebase When You Rebase

0 commit comments

Comments
 (0)