From: dsarrut <david.sarrut@gmail.com>
Date: Mon, 2 May 2011 09:22:58 +0000 (+0200)
Subject: (no commit message)
X-Git-Tag: v1.2.0~2^2~5^2~3
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9763b3847e36d148b12537b7a1a31a74ad34ac58;p=clitk.git

---

diff --git a/notes.org~ b/notes.org~
index ec58a0b..db3e8d1 100644
--- 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
+