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
rust-lang · Dec 29, 2017 · 1a7a5b5 · 1a7a5b5
2 parents f0e5c95 + 9863d35
commit 1a7a5b5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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"]