diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:21 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:21 +0900 |
| commit | 081b08c45c88d21d869adea50cff9d83544418cf (patch) | |
| tree | 6429cad37b6d1a3f820825d1dbf68b91d17dec83 /Documentation | |
| parent | Merge branch 'dl/reset-doc-no-wrt-abbrev' (diff) | |
| parent | Doc: fix misleading asciidoc formating (diff) | |
| download | tgif-081b08c45c88d21d869adea50cff9d83544418cf.tar.xz | |
Merge branch 'ja/dir-rename-doc-markup-fix'
Doc update.
* ja/dir-rename-doc-markup-fix:
Doc: fix misleading asciidoc formating
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/technical/directory-rename-detection.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/technical/directory-rename-detection.txt b/Documentation/technical/directory-rename-detection.txt index 1c0086e287..844629c8c4 100644 --- a/Documentation/technical/directory-rename-detection.txt +++ b/Documentation/technical/directory-rename-detection.txt @@ -20,8 +20,8 @@ More interesting possibilities exist, though, such as: * one side of history renames x -> z, and the other renames some file to x/e, causing the need for the merge to do a transitive rename. - * one side of history renames x -> z, but also renames all files within - x. For example, x/a -> z/alpha, x/b -> z/bravo, etc. + * one side of history renames x -> z, but also renames all files within x. + For example, x/a -> z/alpha, x/b -> z/bravo, etc. * both 'x' and 'y' being merged into a single directory 'z', with a directory rename being detected for both x->z and y->z. |