mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'ja/dir-rename-doc-markup-fix'
Doc update. * ja/dir-rename-doc-markup-fix: Doc: fix misleading asciidoc formating
This commit is contained in:
commit
081b08c45c
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue