diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-10 14:23:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-10 14:23:56 -0700 |
| commit | 74fd0fce3a70fd009c70bab023b424683f3024ea (patch) | |
| tree | c26f8ef8b459b65a757eac86f6f8ef1bd5339b54 /gitglossary.html | |
| parent | ccdabcae204ead708ad13194edd370770437ee5b (diff) | |
| download | git-htmldocs-74fd0fce3a70fd009c70bab023b424683f3024ea.tar.gz | |
Autogenerated HTML docs for v2.8.2-396-g5fe49
Diffstat (limited to 'gitglossary.html')
| -rw-r--r-- | gitglossary.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitglossary.html b/gitglossary.html index 4f03570be..f99296f1f 100644 --- a/gitglossary.html +++ b/gitglossary.html @@ -1003,7 +1003,7 @@ current branch integrates with) obviously do not work, as there is no A fast-forward is a special type of <a href="#def_merge">merge</a> where you have a
<a href="#def_revision">revision</a> and you are "merging" another
<a href="#def_branch">branch</a>'s changes that happen to be a descendant of what
- you have. In such these cases, you do not make a new <a href="#def_merge">merge</a>
+ you have. In such a case, you do not make a new <a href="#def_merge">merge</a>
<a href="#def_commit">commit</a> but instead just update to his
revision. This will happen frequently on a
<a href="#def_remote_tracking_branch">remote-tracking branch</a> of a remote
|