This document provides an overview of using Git and GUI tools for Git. It discusses initializing and committing to a local repository, adding a remote repository, resolving conflicts, branching models like master/develop/feature branches, writing commit messages, generating SSH keys, ignoring files, and migrating from SVN to Git. Links are provided to resources on GitBook, branching models, SSH keys, writing commit messages, hosted version control services and more.

1. GUI Git

2. 1.
2.
3.
4.

4. @afu
https://www.youtube.com/watch?v=_yQlKEq-Ueg

6. Repository
Developer
Developer Developer
Developer
Developer Developer

7. -

8. Repository
MainActivity.java

9. Developer
Repository
MainActivity.java

10. Developer
Repository
MainActivity.java
Developer

11. -

12. Repository
MainActivity.java

13. Developer
Repository
MainActivity.java

14. Repository
MainActivity.java
Developer Developer

15. Repository
MainActivity.java
Developer Developer

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. • ( )
•
• git
@oxxo

21. 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

25. http://www.slant.co/topics/153/compare/~github_vs_gitlab_vs_bitbucket

27. # log
git git config --global user.name weitsai
#
git git config --global user.email
begining1003@gmail.com

28. # Editor (vim, sublime or atom…)
git git config --global core.editor vim

30. Local

31.
git
git git init

32.
git
git | master⚡ touch test.md
test

33.
git
git | master⚡ git add test.md
test

34.
git
git | master⚡ git commit
test

35.
git
git | master echo ‘test’ >> test.md
test

36.
git
git | master⚡ git add test.md
test

37.
git
git | master⚡ git commit -m ‘Update’
test

38. …

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. #
git | master git remote add origin
{repo_url}
#
git | master git remote rm origin
#
git | master git remote -v

47. #
git | master git push origin master
#
git | master git pull origin master
#
git | master git clone {repo_url}

49. # commit
git | master git commit -v
#
git | master git add -p
#
git | master git checkout -f

50. # commit
git | master git log
#
git | master git log -p
# ....
git | master git blame

51. #
git | master git diff

52. #
git | master git checkout -b test
#
git | test git branch
# remote repo)
git | test git branch -a
# commit
git | test git branch -vv

53. # commit
git | master git reset HEAD~1
# commit
git | master git reset HEAD^^
# commit
git | master git reset —hard

54. # commit
git | master git revert HEAD~1
#
git | master git merge —no-f
q[branch]
# commit
git | master git rebase -i [commit]

55. #
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

65. https://www.flickr.com/photos/appleboy/5488984404
Master -
Develop -
Feature -
Release - develop bug
Hotfix - master bug

66. Commit

67. •
• 50
•
•
•
• 72
•

68. http://chris.beams.io/posts/git-commit/

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

86. https://help.github.com/articles/remove-sensitive-data/

87. #
git git filter-branch --force --index-filter
'git rm --cached --ignore-unmatch *.md'
--prune-empty --tag-name-filter cat -- --all

88. SVN

89. # SVN
svn git svn clone -r HEAD {Repo URL}
# SVN Server
git | master⚡ git svn rebase
# Server
git | master⚡ git svn dcommit

91. • Git Book
• A successful Git branching model (Gitflow)
• iHower -
• How to Write a Git Commit Message
• Generating a new SSH key and adding it to the ssh-
agent

92. • What are the best hosted version control services?