本地測試git:
http://lvwzhen.github.io/Git-Tutorial/ Git教程
每個機器都必須自報家門:你的名字和Email地址
$ git config --global user.name "Your Name" $ git config --global user.email "[email protected]"
創建一個空目錄
$ mkdir learngit $ cd learngit $ pwd /Users/michael/learngit
通過git init命令把這個目錄變成Git可以管理的倉庫
$ git init Initialized empty Git repository in /Users/michael/learngit/.git/
編寫一個readme.txt文件,內容如下:
Git is a version control system.
Git is free software.
用命令git add告訴Git,把文件添加到倉庫:
$ git add readme.txt
用命令git commit告訴Git,把文件提交到倉庫:
$ git commit -m "wrote a readme file" [master (root-commit) cb926e7] wrote a readme file 1 file changed, 2 insertions(+) create mode 100644 readme.txt
運行git status命令看看結果:
$ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: readme.txt #no changes added to commit (use "git add" and/or "git commit -a")
可以通過命令:
$ git push origin master
創建dev分支,然後切換到dev分支:
$ git checkout -b dev Switched to a new branch 'dev' git checkout命令加上-b參數表示創建並切換,相當於以下兩條命令: $ git branch dev $ git checkout dev Switched to branch 'dev'
git branch命令查看當前分支:
$ git branch * dev master
可以在dev分支上正常提交,比如對readme.txt做個修改,加上一行:
Creating a new branch is quick.
然後提交:
$ git add readme.txt $ git commit -m "branch test" [dev fec145a] branch test 1 file changed, 1 insertion(+)
現在,dev分支的工作完成,我們就可以切換回master分支:
$ git checkout master Switched to branch 'master'
現在,我們把dev分支的工作成果合併到master分支上:
$ git merge dev Updating d17efd8..fec145a Fast-forward readme.txt | 1 + 1 file changed, 1 insertion(+)
合併完成後,就可以放心地刪除dev分支了:
$ git branch -d dev Deleted branch dev (was fec145a).
刪除後,查看branch,就只剩下master分支了:
$ git branch * master
$ git config --global color.ui true
這樣,Git會適當地顯示不同的顏色
忽略某些文件時,需要編寫.gitignore
#Mac .DS_Store
告訴Git,以後st就表示status:
$ git config --global alias.st status
co表示checkout,ci表示commit,br表示branch:
$ git config --global alias.co checkout $ git config --global alias.ci commit $ git config --global alias.br branch
提交就可以簡寫成:
$ git ci -m "bala bala bala..."
git 錯誤 fatal: This operation must be run in a work tree
git config --bool core.bare true
1 查看遠程分支
git branch -a
2 查看本地分支
git branch
3 創建分支
git branch test
4 切換分支到test
git checkout test
5 刪除本地分支
git branch -d test
7 刪除遠程版本
git branch -r -d origin/branch-name git push origin :branch-name