added some git tips in doc

This commit is contained in:
Jocelyn Fiat
2012-05-15 18:38:16 +02:00
parent cf68ce6681
commit 1d82a55e76
2 changed files with 25 additions and 3 deletions

3
.gitmodules vendored
View File

@@ -1,6 +1,3 @@
[submodule "doc/wiki"]
path = doc/wiki
url = https://github.com/EiffelWebFramework/EWF.wiki.git
[submodule "contrib/library/server/nino"]
path = contrib/library/server/nino
url = https://github.com/Eiffel-World/EiffelWebNino.git

25
doc/git-tips.txt Normal file
View File

@@ -0,0 +1,25 @@
= subtree-merge =
See http://help.github.com/subtree-merge/
For instance
: git remote add -f ewf_wiki https://github.com/EiffelWebFramework/EWF.wiki.git
: git merge -s ours --no-commit ewf_wiki/master
: git read-tree --prefix=doc/wiki/ -u ewf_wiki/master
: git commit -m "Added subtree merged in doc/wiki"
Update
: git pull -s subtree ewf_wiki master
= remove git submodule =
1. Delete the relevant section from the .gitmodules file.
2. Delete the relevant section from .git/config.
3. Run git rm --cached path_to_submodule (no trailing slash).
4. Commit and delete the now untracked submodule files.
Ex:
: vi .gitmodules
: vi .git/config
: git rm --cached doc/wiki
: git commit -m "Removed submodule doc/wiki"