From 2e39a246071eb7bc9153e48e0c9416f069ac2a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= <rene.nyffenegger@adp-gmbh.ch> Date: Mon, 2 May 2016 09:38:20 +0200 Subject: [PATCH] Documentation: fix typo 'In such these cases' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: René Nyffenegger <mail@renenyffenegger.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/glossary-content.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index f04b48ef0d4..96307c870c1 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