(no commit message)

diff --git a/notes.org~ b/notes.org~
index ec58a0b5d7e0c341ddb988d93ee7de67ce82e7b7..db3e8d152f5818a8b2c134107b1dfbe1b538c1d2 100644 (file)
--- a/notes.org~
+++ b/notes.org~
@@ -1,12 +1,27 @@
 
 * GIT emacs command
 C-x v d 
-.gitignore -> contains ignored files
+.gitignore -> contains ignored files (recursive)
 commit (local)
 push (repository)
 pull
 
+gitk for GUI
+meld / kdiff3
+
+git status
+git add (-> index)
+git commit (->local commit)
+git pull (fetch + merge)
+git push
+
+COMMIT : C-x g c f
+(git-commit-file &optional AMEND)
+
 * Test in temp
 git clone http://www.creatis.insa-lyon.fr/~dsarrut/clitk3.pub.git clitk3
 need itk4 (git) ?
 
+
+* git merge cvs
+