From b4c8c7036035a7098f45f4380b56c46285794eba Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Thu, 20 Dec 2012 15:40:42 +0100 Subject: [PATCH] updated doc related to git --- doc/git-tips.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/git-tips.txt b/doc/git-tips.txt index 62938132..aa2aef63 100644 --- a/doc/git-tips.txt +++ b/doc/git-tips.txt @@ -17,19 +17,22 @@ Reconnect subtree from a cloned repository - doc/wiki git remote add -f ewf_wiki https://github.com/EiffelWebFramework/EWF.wiki.git 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 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 pull -s subtree ewf_curl master + git pull -X subtree=contrib/ise_library/cURL ewf_curl master + - contrib/library/text/parser/json git remote add -f ewf_json https://github.com/eiffelhub/json.git 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 git remote add -f ewf_nino https://github.com/Eiffel-World/EiffelWebNino.git 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 git remote add -f ewf_nino https://github.com/Eiffel-World/EiffelWebNino.git