git應用入門

feiyang10086

git應用入門

安裝配置

Bash代碼

1. $ git config --global user.name "Your Name"  
   
2. $ git config --global user.email your.email@example.com  
   
3. 
   
4. $ git config --global user.name "Your Name"
   
5. $ git config --global user.email your.email@example.com
   
6. 
   
7. 使用co作為checkout的alias

復制代碼

Java代碼

1. $ git config --global alias.co checkout  
   
2. 
   
3. $ git config --global alias.co checkout
   
4. 
   
5. 設置git的默認編輯器

復制代碼

Java代碼

1. $ git config --global core.editor "subl -w"  
   
2. 
   
3. $ git config --global core.editor "subl -w"
   
4. 
   
5. Replace "subl -w" with "mate -w" for TextMate, "gvim -f" for gVim, or "mvim -f" for MacVim.
   
6. 
   
7. 初始化git空文件夾
   
8. 
   
9. Java代碼  
   
10. [code]$ git init  
    
11. 
    
12. $ git init
    
13. Initialized empty Git repository in /Users/mhartl/rails_projects/first_app/.git/

復制代碼

配置rails命令生成的.gitignore文件




Java代碼  
# Ignore bundler config   
/.bundle   
  
# Ignore the default SQLite database.   
/db/*.sqlite3   
  
# Ignore all logfiles and tempfiles.   
/log/*.log   
/tmp  

# Ignore bundler config
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3

# Ignore all logfiles and tempfiles.
/log/*.log
/tmp


Mac OS 如此配置[/code]
Java代碼

1. # Ignore bundler config   
   
2. /.bundle   
   
3.   
   
4. # Ignore the default SQLite database.   
   
5. /db/*.sqlite3   
   
6.   
   
7. # Ignore all logfiles and tempfiles.   
   
8. /log/*.log   
   
9. /tmp   
   
10.   
    
11. # Ignore other unneeded files.   
    
12. doc/   
    
13. *.swp   
    
14. *~   
    
15. .project   
    
16. .DS_Store  
    
17. 
    
18. # Ignore bundler config
    
19. /.bundle
    
20. 
    
21. # Ignore the default SQLite database.
    
22. /db/*.sqlite3
    
23. 
    
24. # Ignore all logfiles and tempfiles.
    
25. /log/*.log
    
26. /tmp
    
27. 
    
28. # Ignore other unneeded files.
    
29. doc/
    
30. *.swp
    
31. *~
    
32. .project
    
33. .DS_Store
    
34. 
    
35. add和commit
    
36. 
    
37. Java代碼  
    
38. $ git add .  
    
39. 
    
40. $ git add .
    
41. 
    
42. 查看狀態(tài)
    
43. 
    
44. Java代碼  
    
45. $ git status   
    
46. # On branch master   
    
47. #   
    
48. # Initial commit   
    
49. #   
    
50. # Changes to be committed:   
    
51. #   (use "git rm --cached <file>..." to unstage)   
    
52. #   
    
53. #       new file:   README.rdoc   
    
54. #       new file:   Rakefile   
    
55. ...  
    
56. 
    
57. $ git status
    
58. # On branch master
    
59. #
    
60. # Initial commit
    
61. #
    
62. # Changes to be committed:
    
63. #   (use "git rm --cached <file>..." to unstage)
    
64. #
    
65. #       new file:   README.rdoc
    
66. #       new file:   Rakefile
    
67. ...

復制代碼

提交命令

Java代碼

1. $ git commit -m "Initial commit"  
   
2. [master (root-commit) df0a62f] Initial commit   
   
3. 42 files changed, 8461 insertions(+), 0 deletions(-)   
   
4. create mode 100644 README.rdoc   
   
5. create mode 100644 Rakefile  
   
6. 
   
7. $ git commit -m "Initial commit"
   
8. [master (root-commit) df0a62f] Initial commit
   
9. 42 files changed, 8461 insertions(+), 0 deletions(-)
   
10. create mode 100644 README.rdoc
    
11. create mode 100644 Rakefile

復制代碼

(-m讓你添加一條提交信息)

查看git日志


Java代碼

1. $ git log   
   
2. commit df0a62f3f091e53ffa799309b3e32c27b0b38eb4   
   
3. Author: Michael Hartl <michael@michaelhartl.com>   
   
4. Date:   Thu Oct 15 11:36:21 2009 -0700  
   
5.   
   
6.   Initial commit   
   
7. ...  
   
8. 
   
9. $ git log
   
10. commit df0a62f3f091e53ffa799309b3e32c27b0b38eb4
    
11. Author: Michael Hartl <michael@michaelhartl.com>
    
12. Date:   Thu Oct 15 11:36:21 2009 -0700
    
13. 
    
14.   Initial commit
    
15. ...
    

復制代碼

關于回滾
Java代碼

1. $ git checkout -f   
   
2. $ git status   
   
3. # On branch master   
   
4. nothing to commit (working directory clean)   
   
5. $ ls app/controllers/   
   
6. application_controller.rb  
   
7. 
   
8. $ git checkout -f
   
9. $ git status
   
10. # On branch master
    
11. nothing to commit (working directory clean)
    
12. $ ls app/controllers/
    
13. application_controller.rb

復制代碼

(-f強制重寫當前改變)

關于同步到遠程github
Java代碼

1. $ git remote add origin git@github.com:<username>/first_app.git   
   
2. $ git push origin master  
   
3. 
   
4. $ git remote add origin git@github.com:<username>/first_app.git
   
5. $ git push origin master

復制代碼

關于git的分支
Java代碼

1. $ git checkout -b modify-README   
   
2. Switched to a new branch 'modify-README'  
   
3. $ git branch   
   
4. master   
   
5. * modify-README  
   
6. 
   
7. $ git checkout -b modify-README
   
8. Switched to a new branch 'modify-README'
   
9. $ git branch
   
10. master
    
11. * modify-README

復制代碼

(使用checkout的-b創(chuàng)建分支，git branch查看當前所有的分支,*說明當前的分支
git checkout -b modify-README創(chuàng)建分支并轉換到當前分支

關于git的編輯功能
Java代碼  
$ git mv README.rdoc README.md   
$ subl README.md  

$ git mv README.rdoc README.md
$ subl README.md
mv類似unix的mv

新的README.md
Java代碼

1. # Ruby on Rails Tutorial: first application   
   
2.   
   
3. This is the first application for  
   
4. [*Ruby on Rails Tutorial: Learn Rails by Example*](http://railstutorial.org/)   
   
5. by [Michael Hartl](http://michaelhartl.com/).   
   
6.   
   
7. $ git status   
   
8. # On branch modify-README   
   
9. # Changes to be committed:   
   
10. #   (use "git reset HEAD <file>..." to unstage)   
    
11. #   
    
12. #       renamed:    README.rdoc -> README.md   
    
13. #   
    
14. # Changed but not updated:   
    
15. #   (use "git add <file>..." to update what will be committed)   
    
16. #   (use "git checkout -- <file>..." to discard changes in working directory)   
    
17. #   
    
18. #       modified:   README.md   
    
19. #  
    
20. 
    
21. # Ruby on Rails Tutorial: first application
    
22. 
    
23. This is the first application for
    
24. [*Ruby on Rails Tutorial: Learn Rails by Example*](http://railstutorial.org/)
    
25. by [Michael Hartl](http://michaelhartl.com/).
    
26. 
    
27. $ git status
    
28. # On branch modify-README
    
29. # Changes to be committed:
    
30. #   (use "git reset HEAD <file>..." to unstage)
    
31. #
    
32. #       renamed:    README.rdoc -> README.md
    
33. #
    
34. # Changed but not updated:
    
35. #   (use "git add <file>..." to update what will be committed)
    
36. #   (use "git checkout -- <file>..." to discard changes in working directory)
    
37. #
    
38. #       modified:   README.md
    
39. #

復制代碼

提交
Java代碼

1. $ git commit -a -m "Improve the README file"  
   
2. 2 files changed, 5 insertions(+), 243 deletions(-)   
   
3. delete mode 100644 README.rdoc   
   
4. create mode 100644 README.md  
   
5. 
   
6. $ git commit -a -m "Improve the README file"
   
7. 2 files changed, 5 insertions(+), 243 deletions(-)
   
8. delete mode 100644 README.rdoc
   
9. create mode 100644 README.md
   
10. (-a提交所有改變)

復制代碼

關于合并Merge
Java代碼

1. $ git checkout master   
   
2. Switched to branch 'master'  
   
3. $ git merge modify-README   
   
4. Updating 34f06b7..2c92bef   
   
5. Fast forward   
   
6. README.rdoc     |  243 --------------------------------------------------   
   
7. README.md       |    5 +   
   
8. 2 files changed, 5 insertions(+), 243 deletions(-)   
   
9. delete mode 100644 README.rdoc   
   
10. create mode 100644 README.md  
    
11. 
    
12. $ git checkout master
    
13. Switched to branch 'master'
    
14. $ git merge modify-README
    
15. Updating 34f06b7..2c92bef
    
16. Fast forward
    
17. README.rdoc     |  243 --------------------------------------------------
    
18. README.md       |    5 +
    
19. 2 files changed, 5 insertions(+), 243 deletions(-)
    
20. delete mode 100644 README.rdoc
    
21. create mode 100644 README.md

復制代碼

合并了所有changes后可以執(zhí)行以下命令
Java代碼  
$ git branch -d modify-README   
Deleted branch modify-README (was 2c92bef).  

$ git branch -d modify-README
Deleted branch modify-README (was 2c92bef).
用以刪除合并了的分支,這步可選

Java代碼

1. # For illustration only; don't do this unless you mess up a branch   
   
2. $ git checkout -b topic-branch   
   
3. $ <really screw up the branch>   
   
4. $ git add .   
   
5. $ git commit -a -m "Major screw up"  
   
6. $ git checkout master   
   
7. $ git branch -D topic-branch  
   
8. 
   
9. # For illustration only; don't do this unless you mess up a branch
   
10. $ git checkout -b topic-branch
    
11. $ <really screw up the branch>
    
12. $ git add .
    
13. $ git commit -a -m "Major screw up"
    
14. $ git checkout master
    
15. $ git branch -D topic-branch

復制代碼

使用git branch -D 遺棄分支
(與-d不同，-D可以刪除沒有合并過的分支)

關于push
Java代碼  
$ git push  

$ git push
在大多數系統(tǒng)上可以省略origin master直接使用git push
在某些系統(tǒng)上會出現問題
Java代碼

1. $ git push   
   
2. fatal: The current branch master is not tracking anything.  
   
3. 
   
4. $ git push
   
5. fatal: The current branch master is not tracking anything.

復制代碼

陽光的扣子

謝謝分享

時間看來

github不錯~

lastfile

謝謝分享，收藏