From fc954c9521a20d06fa035c3f5a9d0ef2df626f3e Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Mon, 18 Mar 2013 16:23:13 +0100 Subject: [PATCH] added small doc on how to include EWF git repo in another git repository --- doc/how-to-include-ewf-in-my-git-repository.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/how-to-include-ewf-in-my-git-repository.txt diff --git a/doc/how-to-include-ewf-in-my-git-repository.txt b/doc/how-to-include-ewf-in-my-git-repository.txt new file mode 100644 index 00000000..1b54b051 --- /dev/null +++ b/doc/how-to-include-ewf-in-my-git-repository.txt @@ -0,0 +1,15 @@ +GOAL: include EWF into your own git repository +For instance, let's put it under lib/EWF + + git remote add -f _ewf https://github.com/EiffelWebFramework/EWF.git + git merge --squash -s ours --no-commit _ewf/master + git read-tree --prefix=lib/EWF/ -u _ewf/master + git commit -m "Imported EWF into subtree lib/EWF/" + +Then to update lib/EWF + git pull -X subtree=lib/EWF _ewf master + +From another git clone, reconnect this "import" + git remote add -f _ewf https://github.com/EiffelWebFramework/EWF.git + git merge -s ours --no-commit --squash _ewf/master + and then update lib/EWF as described before