diff options
| author | bors <bors@rust-lang.org> | 2017-12-29 17:32:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-29 17:32:17 +0000 |
| commit | 1a7a5b5e38020f68d5cf376659f9d8d2ed8cc75e (patch) | |
| tree | aec3466cd8004c95b6c6765498c19bb7b2b83a84 | |
| parent | f0e5c953e4be3b5aee49cdcc0b1c244681392961 (diff) | |
| parent | 9863d35cd61ca8dc4bd8a5fca4eb161b03f78632 (diff) | |
Auto merge of #47049 - eddyb:submodules, r=alexcrichton
Always name git submodules by their paths. Two submodules didn't follow the convention and they kept breaking rebases in GitKraken. r? @alexcrichton
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 0a1188e83ea..373ca90eca1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,10 +21,10 @@ [submodule "src/tools/cargo"] path = src/tools/cargo url = https://github.com/rust-lang/cargo.git -[submodule "reference"] +[submodule "src/doc/reference"] path = src/doc/reference url = https://github.com/rust-lang-nursery/reference.git -[submodule "book"] +[submodule "src/doc/book"] path = src/doc/book url = https://github.com/rust-lang/book.git [submodule "src/tools/rls"] |