simple git

34
Git Caesar Chi-clonn@plurk Caesar Chi@facebook Clonn.blogspot.com

Upload: caesar-chi

Post on 20-Aug-2015

1.799 views

Category:

Technology


0 download

TRANSCRIPT

GitCaesar Chi-clonn@plurkCaesar [email protected]

Git簡介

Team work you need

version control

Git 分散式架構

Git,linux同一個工廠誕生

初學?

Github.comSocial coding

從做中學開啟自己的 github 專案開始

Git基本指令

Git log凡走過必留下痕跡

Git merge -branch

將其他 branch 整進來

Git pull= git fetch + git merge

Git commitCommit 下的好,維護沒煩惱

Git push推,就對了

Git diff檢視 code 差異

Git reset還原自上次的 push

Git checkout -filepath

放棄檔案更新

Git checkout –branch

放棄檔案更新

Git branch

本地 branch操作

Git rm刪除 git 的記憶

Git其他指令

Git rebase –commitid 重新調整基底

a-b-c-d master \ e-f-g-h feature_branch

重新調整基底a-b-c-d-i-j-k-l master \ e-f-g-h feature_branch

Git rebase –commitid

Git cherry-picker 撿取自己要得

a-b-c-d-i-j-k-l master \ e-f-g-h feature_branch

Git cherry-picker 撿取自己要得

a-b-c-d-i-j-k-l master \ e-f-g-h feature_branch

Git cherry-picker 撿取自己要得

a-b-c-d-f-h-i-j-k-l master \ e-f-g-h feature_branch

Git stash 將部份的 code 藏起來可參考 git stash --help

Git stash Git add –fileGit stashGit stash listGit stash pop

Git config~/.gitconfig

alias[alias] st = status br = branch rb = svn rebase ci = commit co = checkout sub = submodule

遠端 branchgit push origin feature_20111216_caesar_cmstool:refs/heads/feature_testgit fetch origingit branch --track feature_test origin/feature_testgit checkout feature_test

GRBhttps://github.com/webmat/git_remote_branchhttp://thinkvitamin.com/code/git-pro-tip-let-grb-handle-remote-branches-for-you/

Git never end