Git is a distributed version control system created by Linus Torvalds in 2005. It allows tracking changes to files and coordinating work among contributors. Common Git commands include git add to stage files, git commit to save file changes to the local database, and git push to sync changes with remote repositories. Branches allow contributors to work independently on different features or fixes simultaneously. Merging brings changes from one branch into another.

1. Git
@

2. Git
•

3. Git
•
• 2005 Linus Torvalds

4. Git
•
• 2005 Linus Torvalds
• the stupid content tracker

5. Git
•
• 2005 Linus Torvalds
• the stupid content tracker

6. Git
•

7. Git
•
•

8. Git
•
•
•

9. Git

13. Git
•

14. Git
•
•

17. Git

18. • blob -
• tree -
• commit -
tree
• tag - blob, tree
commit commit

23. • git clone git@cat.meituan.com:www
• git clone git@cat.meituan.com:www mt

24. • $git config --global user.name "john"
• $git config --global user.email john@gmail.com

25. • git add template/deal/default.php
• git commit -m “update deal ui”

26. • git push

27. • git push
• git push origin master

28. • git status

29. • git status
• git status -s

30. • git add
• git reset HEAD
• git checkout
• git rm
• git mv

31. • git diff
• git diff --cached
• git diff HEAD
• git diff origin

32. • git log
• git log -5
• git log -p
• git log -p --author=panweizeng
• git log --since=2011-05-24
• git log --until=2011-05-25
• git log --name-only

33. • git log --pretty=oneline
• git log --pretty=format:%h:%s
• git log --graph

34. • git log --pretty=oneline
• git log --pretty=format:%h:%s
• git log --graph
• fisheye
http://www.atlassian.com/software/fisheye/

35. • git pull

36. • git pull
• git fetch && git merge origin/master

37. • git help command
git help commit
git help push
git help log

38. • Git

39. • git branch hotfix
• git checkout -b hotfix
• git checkout -b hotfix master

40. • git checkout hotfix
• git checkout master

41. • git merge hotfix
• git merge origin/master
• git merge --squash

42. • git branch -v
• git branch -d hotfix
• git branch -D hotfix
• git branch --merged
• git branch --no-merged

43. • git push origin abc #
• git push origin :abc #
• git branch -a #
• git push origin panweizeng/abc
• git push origin :panweizeng/abc

44. •

45. •
•

47. master

48. master
develop

49. master
develop
mirror

50. master
develop
mirror

51. master
develop
mirror

52. master
develop
mirror

54. master

55. •

56. • git config --global color.ui auto
• git config --global alias.st status
• git config core.filemode false
• git config -l
• /etc/gitconfig
~/.gitconfig
.git/config

57. HASH
• git show c2bd66ee2f5ebef7dac171fca57875bd99f47318
• git show c2bd66ee2f5ebef7
• git show c2bd66ee
• git show c2bd

58. • git stash
• git stash apply
• git stash list
• git stash branch abc

59. • git grep keyword
• git grep keyword -i -A10 -B10

60. • git blame filename

61. • git commit -m “new mobile”
• git add forgotten_file
• git commit --amend

62. • git rebase -i 32cb53^
• git commit --amend
• git rebase --continue

63. • git rebase -i 32cb53^
• git commit --amend
• git rebase --continue
push

64. diff
• git diff > ~/diff # diff
• git apply ~/diff # diff
• patch -p1 < ~/diff # git

65. [panweizeng@dev:mt(master)]$ git checkout develop
Switched to branch 'develop'
[panweizeng@dev:mt(develop)]$ git checkout mis
Switched to branch 'mis'
[panweizeng@dev:mt(mis)]$

66. ~/.bashrc
function parse_git_branch {
git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e
's/* (.*)/(1)/' -e 's/((/(/' -e 's/))/)/'
}
function proml {
local GREEN="[033[0;32m]"
local COLOR_END="033[0m"
PS1="[u@h:W$GREEN$(parse_git_branch)$COLOR_END]$ "
}
proml

67. $cd ~/bin
$curl -O https://github.com/git/git/raw/master/
contrib/completion/git-completion.bash
$curl -O https://github.com/bobthecow/git-flow-
completion/raw/master/git-flow-completion.bash
~/.bashrc
source ~/bin/git-completion.bash
source ~/bin/git-flow-completion.bash

68. $cd ~/bin
$curl -O https://github.com/git/git/raw/master/
contrib/completion/git-completion.bash
$curl -O https://github.com/bobthecow/git-flow-
completion/raw/master/git-flow-completion.bash
~/.bashrc
source ~/bin/git-completion.bash
source ~/bin/git-flow-completion.bash
/etc/bash_completion.d/ /etc/profile
for i in /etc/bash_completion.d/* ; do
if [ -r "$i" ]; then
. $i
fi
done

70. •

71. •
•

72. •
•
• git

73. The End
• http://progit.org/book/zh

74. The End
• http://progit.org/book/zh