Differences

This shows you the differences between two versions of the page.

--- git [2010/02/10 02:59] – suapapa
+++ git [2013/08/03 05:04] (current) – external edit 127.0.0.1
@@ Line 32: / Line 32: @@
 git tag -l
 </code>
-브랜치간 뛰기 (커널 예)
+리모트 브랜치를 로컬 브랜치로 따라가기.
 <code>
 git checkout --track -b android-2.6.29 origin/android-2.6.29
@@ Line 43: / Line 43: @@
 <code>
 git mergetool
+</code>
+현재 저장소에 다른 브랜치를 추가!
+<code bash>
+$ git remote add suapapa git@github.com:suapapa/openFrameworks.git
+$ git pull suapapa
+$ git branch -a
+$ git branch --track suapapa suapapa/master
+</code>
+[[http://www.aesop.or.kr/?document_srl=187545|git remote]] 사용방법
+컬러 쉘 설정
+<code bash>
+$ git config --global color.ui "auto"
 </code>
@@ Line 50: / Line 65: @@
 $ git config merge.tool meld
 </code>
+===== github =====
+  *[[http://help.github.com/forking/|forking help]] from github
 ====== git-svn ======
-  *[[http://flavio.castelli.name/howto_use_git_with_svn|Howto use Git and svn together]]
+===== 우분투에서의 설치 =====
-우분투에서의 설치
 <code bash>
 $ sudo apt-get install git-svn
@@ Line 61: / Line 78: @@
 PATH=$PATH:/usr/lib/git-core/
 </code>
+===== working cycle =====
+<code bash>
+$ git-svn clone [svn_repo_addr] [to_dir]
+</code>
+<code bash>
+$ git checkout -b [specific_work_branch]
+</code>
+<code bash>
+$ git add -u
+$ git commit -m "your log here"
+</code>
+<code bash>
+$ git branch master
+$ git-svn rebase
+$ git rebase [specific_work_branch]
+$ git-svn dcommit
+</code>
+===== reference =====
+  *[[http://flavio.castelli.name/howto_use_git_with_svn|Howto use Git and svn together]]
 ====== references ======
   *[[http://wiki.kldp.org/wiki.php/GitGuideForKernelDevelopment|GitGuideForKernelDevelopment]]