updated doc related to git

This commit is contained in:
Jocelyn Fiat
2012-12-20 15:40:42 +01:00
parent 633a5afe7f
commit b4c8c70360

View File

@@ -17,19 +17,22 @@ Reconnect subtree from a cloned repository
- doc/wiki - doc/wiki
git remote add -f ewf_wiki https://github.com/EiffelWebFramework/EWF.wiki.git git remote add -f ewf_wiki https://github.com/EiffelWebFramework/EWF.wiki.git
git merge -s ours --no-commit --squash ewf_wiki/master git merge -s ours --no-commit --squash ewf_wiki/master
git pull -s subtree ewf_wiki master git pull -X subtree=doc/wiki ewf_wiki master
- contrib/ise_library/cURL - contrib/ise_library/cURL
git remote add -f ewf_curl https://github.com/EiffelSoftware/mirror-Eiffel-cURL.git git remote add -f ewf_curl https://github.com/EiffelSoftware/mirror-Eiffel-cURL.git
git merge -s ours --no-commit --squash ewf_curl/master git merge -s ours --no-commit --squash ewf_curl/master
git pull -s subtree ewf_curl master git pull -X subtree=contrib/ise_library/cURL ewf_curl master
- contrib/library/text/parser/json - contrib/library/text/parser/json
git remote add -f ewf_json https://github.com/eiffelhub/json.git git remote add -f ewf_json https://github.com/eiffelhub/json.git
git merge -s ours --no-commit --squash ewf_json/master git merge -s ours --no-commit --squash ewf_json/master
git pull -s subtree ewf_json master git pull -X subtree=contrib/library/text/parser/json ewf_json master
- contrib/library/network/server/nino - contrib/library/network/server/nino
git remote add -f ewf_nino https://github.com/Eiffel-World/EiffelWebNino.git git remote add -f ewf_nino https://github.com/Eiffel-World/EiffelWebNino.git
git merge -s ours --no-commit --squash ewf_nino/master git merge -s ours --no-commit --squash ewf_nino/master
git pull -s subtree ewf_nino master git pull -X subtree=contrib/library/network/server/nino ewf_nino master
When there are troubles ... to pull subtree from a cloned repository When there are troubles ... to pull subtree from a cloned repository
git remote add -f ewf_nino https://github.com/Eiffel-World/EiffelWebNino.git git remote add -f ewf_nino https://github.com/Eiffel-World/EiffelWebNino.git