diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-10 13:40:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-10 13:40:32 -0700 |
| commit | 5a2906812b815ac129f9d324bd132edc045b5329 (patch) | |
| tree | 4ed8ddaf1fabb2c44ec25e6f573d3512df086af2 /Documentation | |
| parent | Merge branch 'ls/travis-submitting-patches' (diff) | |
| parent | Documentation: fix typo 'In such these cases' (diff) | |
| download | tgif-5a2906812b815ac129f9d324bd132edc045b5329.tar.xz | |
Merge branch 'rn/glossary-typofix'
* rn/glossary-typofix:
Documentation: fix typo 'In such these cases'
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 cafc284359..8ad29e61a9 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -145,7 +145,7 @@ current branch integrates with) obviously do not work, as there is no 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 |