Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

git-guide.md: Use the singular 'they' pronoun.

This commit is contained in:
Vaida Plankyte 2017-07-05 11:49:00 +02:00 committed by Tim Abbott
parent c88530366e
commit 18bf15cfed
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/git-guide.md
View File

@ -203,7 +203,7 @@ current state of the index and advancing HEAD to point at the new
A fast-forward is a special type of merge where you have a revision A fast-forward is a special type of merge where you have a revision
and you are "merging" another branch's changes that happen to be a and you are "merging" another branch's changes that happen to be a
descendant of what you have. In such these cases, you do not make a descendant of what you have. In such these cases, you do not make a
new mergecommit but instead just update to his revision. This will new mergecommit but instead just update to their revision. This will
happen frequently on a remote-tracking branch of a remote happen frequently on a remote-tracking branch of a remote
repository. repository.