diff options
| author |  René Nyffenegger <rene.nyffenegger@adp-gmbh.ch> | 2016-05-02 09:38:20 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-05-02 12:45:02 -0700 |
| commit | 2e39a246071eb7bc9153e48e0c9416f069ac2a17 (patch) | |
| tree | c333bd3afd0aac87653ceb93dc3a6dd737f0fe74 /Documentation | |
| parent | Change "tracking branch" to "remote-tracking branch" (diff) | |
| download | tgif-2e39a246071eb7bc9153e48e0c9416f069ac2a17.tar.xz | |
Documentation: fix typo 'In such these cases'
Signed-off-by: René Nyffenegger <mail@renenyffenegger.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/glossary-content.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index f04b48ef0d..96307c870c 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -128,7 +128,7 @@ to point at the new commit. A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are "merging" another <<def_branch,branch>>'s changes that happen to be a descendant of what - you have. In such these cases, you do not make a new <<def_merge,merge>> + you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote |