沒有 GUI 的 git

Transcript

1.  GUI
   Git   
2. 1. çÑÙs 2. çÑC·=< 3. B L:
   3.¦˯ 4. I'Ã]
   vw }v xHÕz„¶ï
3. rTՓÍ_hJ\²
4.  @afu   https://www.youtube.com/watch?v=_yQlKEq-Ueg
5. è—
6. Repository Developer Developer Developer Developer Developer Developer
7. è— - äM—
8. Repository MainActivity.java
9. Developer Repository MainActivity.java
10. Developer Repository MainActivity.java Developer
11. è— - më—
12. Repository MainActivity.java
13. Developer Repository MainActivity.java
14. Repository MainActivity.java Developer Developer
15. Repository MainActivity.java Developer Developer
16. !Η
17. Develop Repository Develop Develop Develop Repository Office Repository Develop Develop Repository Fork
18. Develop Repository Develop Develop Develop Repository Office Repository Develop Develop Repository Commit
19. Develop Repository Develop Develop Develop Repository Office Repository Develop Develop Repository Pull Request
20. • …Y+ (!Η) • »ÚƒŸˆ • ‡}79 git <4  @oxxo 
21. ¤m GUI or CLI?
22. http://www.slant.co/topics/465/compare/~the-command-line_vs_sourcetree_vs_tower-2
23. https://www.facebook.com/groups/git.tw/permalink/991589810889687/?qa_ref=qd
24. Git oœ
    pµ
25. http://www.slant.co/topics/153/compare/~github_vs_gitlab_vs_bitbucket
26. Àq¹¿¡M
27. # ¡M log ¦
    ì¾ git 㱺 git config --global user.name weitsai # ¡M±Ý-Aà git 㱺 git config --global user.email begining1003@gmail.com
28. # ¡MÄ- Editor (vim, sublime or atom…) git 㱺 git config --global core.editor vim
29. ½H”Å
30. Local
31. 
 hJŽ¯ 
 â´¥ 
 git Ž¯ git 㱺 git init
32. 
 â´¥ 
 git Ž¯ git | master⚡ 㱺 touch test.md 
 hJŽ¯ test
33. 
 â´¥ 
 git Ž¯ git | master⚡ 㱺 git add test.md test 
 hJŽ¯
34. 
 â´¥ 
 git Ž¯ git | master⚡ 㱺 git commit test 
 hJŽ¯
35. 
 â´¥ 
 git Ž¯ git | master 㱺 echo ‘test’ >> test.md 
 hJŽ¯ test
36. 
 â´¥ 
 git Ž¯ git | master⚡ 㱺 git add test.md test 
 hJŽ¯
37. 
 â´¥ 
 git Ž¯ git | master⚡ 㱺 git commit -m ‘Update’ test 
 hJŽ¯
38. ‰0…
39. git | master 㱺 echo ‘test’ >> test.md git | master⚡ 㱺 git add test.md
40. git | master 㱺 git cat-file -t 9daeafb9864cf43055ae93beb0afd6c7d144bfa4 blob git | master 㱺 git cat-file -p 9daeafb9864cf43055ae93beb0afd6c7d144bfa4 test
41. git | master 㱺 git commit -m ‘Add test file’ [master (root-commit) 77f64af] Add test file 1 file changed, 1 insertion(+) create mode 100644 test.md git | master 㱺 git cat-file -t 77f64af commit git | master 㱺 git cat-file -p 77f64af
42. git | master 㱺 git cat-file -p 9098a4 100644 blob 9098a46b8a3cb674c82833688dfb5c77995053c2 test.md git | master 㱺 git cat-file -t 9098a4 tree
43. Commit 77f64af Tree Blob 9daeaf 77f64af
45. Remote
46. # F uÉ
    iÑÛk git | master 㱺 git remote add origin {repo_url} # å¼ uÉ
    iÑÛk git | master 㱺 git remote rm origin # ›uÉ
    iÑÛk git | master 㱺 git remote -v
47. # F uÉ
    iÑÛk git | master 㱺 git push origin master # ›uÉ
    iÑÛk git | master 㱺 git pull origin master # ›uÉ
    iÑÛk git | master 㱺 git clone {repo_url}
48. bé”Å
49. #  commit
    Q#7Ë¯ git | master 㱺 git commit -v # ŒÏ—FçÑ git | master 㱺 git add -p # ftRK· git | master 㱺 git checkout -f
50. # › commit ˯ git | master 㱺 git log # º™·
    l{ git | master 㱺 git log -p # dž×.... git | master 㱺 git blame
51. # ›·Ë¯ git | master 㱺 git diff
52. # ª©
    !š git | master 㱺 git checkout -b test # ®$H%É
    !š git | test 㱺 git branch # ®$L!š íÓ remote repo) git | test 㱺 git branch -a # L!š"1
    commit git | test 㱺 git branch -vv
53. # @K commit
    Н git | master 㱺 git reset HEAD~1 # @K? commit
    Н git | master 㱺 git reset HEAD^^ # ~¦ @æ
    commit çÑ git | master 㱺 git reset —hard
54. # ^³; commit git | master 㱺 git revert HEAD~1 # &³ !š:mëíʨî git | master 㱺 git merge —no-f q[branch] # ' commit ˯:· git | master 㱺 git rebase -i [commit]
55. # më”M!š6
    !š git | master 㱺 git merge —no-f {branch_name}
56. Conflict
57. git | master 㱺 echo ‘  GUI
    GIT’ > README.md git | master⚡ 㱺 git add README.md git | master⚡ 㱺 git commit -m ‘Add README’
58. git | master 㱺 git checkout -b conflict git | conflict 㱺 echo ‘, GUI
    GIT’ > README.md git | conflict ⚡ 㱺 git add README.md git | conflict ⚡ 㱺 git commit -m ‘Update README’
59. git | conflict 㱺 git checkout master git | master 㱺 echo ‘ GUI
    GIT’ > README.md git | master ⚡ 㱺 git add README.md git | master ⚡ 㱺 git commit -m ‘Update README(master)’
60. git | master 㱺 git checkout conflict git | conflict 㱺 echo ‘, GUI
    GIT’ > README.md git | conflict ⚡ 㱺 git add README.md git | conflict ⚡ 㱺 git commit -m ‘Update README(conflict)’
61. git | conflict 㱺 git rebase master
62. git | conflict 㱺 vim README.md
63. 
64. 
65. https://www.flickr.com/photos/appleboy/5488984404 Master - ÞMxH Develop - *(xH Feature - X
    ‹ Release - ·X develop bug Hotfix - «Ö·X master bug
66. Commit
67. • ­j&l{tE • ­je 50 –n • ­j*O•–Á • ­j P€ • ­j¬g‚-#Z˜
    –aí dê–î • l{E" 72 –n • l{¬g|Ü5 :ïc:
    ï
68. http://chris.beams.io/posts/git-commit/
69. >}Ò2
70. SSH key
71. https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/
73. Alias
74. CRLF
75. # OS X git | master 㱺 git config --global core.autocrlf input # Windows git | master 㱺 git config --global core.autocrlf true
76. Tool
77. https://github.com/buunguyen/octotree
78. https://rtyley.github.io/bfg-repo-cleaner/
79. Security
80. gitignore
81. git 㱺 javac test.java git 㱺 git status
82. http://gitignore.io/
83. https://github.com/github/gitignore
85. Ì ØJ’Ä
86. https://help.github.com/articles/remove-sensitive-data/
87. # å¼á8W¢¸ git 㱺 git filter-branch --force --index-filter \ 'git rm --cached --ignore-unmatch *.md' \ --prune-empty --tag-name-filter cat -- --all
88. SVN
89. # ^Už SVN iÑ svn 㱺 git svn clone -r HEAD {Repo URL} # °`·Æ#[Dy SVN Server git | master⚡ 㱺 git svn rebase # N²—ŠV Server  git | master⚡ 㱺 git svn dcommit