最好的git中文教程

git
git
http://roclinux.cn/
sirniu@gmail.com
1 / 112
2009
git
2009
git..........................................................................................................................................................1
.....................................................................................................................................................................2
git.............................................................................................................................................4
git.............................................................................................................................................5
git.............................................................................................................................................9
git...........................................................................................................................................11
git...........................................................................................................................................15
git...........................................................................................................................................19
git...........................................................................................................................................20
git...........................................................................................................................................28
git...........................................................................................................................................29
git()..................................................................................................................................31
git...........................................................................................................................................34
git........................................................................................................................................37
git........................................................................................................................................41
git........................................................................................................................................46
git........................................................................................................................................47
2 / 112
git
2009
git........................................................................................................................................49
git........................................................................................................................................50
git........................................................................................................................................52
git()..............................................................................................................................54
git........................................................................................................................................59
git........................................................................................................................................63
git....................................................................................................................................66
git....................................................................................................................................82
git....................................................................................................................................84
git....................................................................................................................................91
git....................................................................................................................................96
git..................................................................................................................................102
git..................................................................................................................................103
git..................................................................................................................................109
git..................................................................................................................................110
git......................................................................................................................................112
git...............................................................................................................................113
3 / 112
git
2009
git
rcscvssvn git
git vcs(version control system) git
rocrocket cvs svn git

git git rocrocket
^_^
roclinux.cn git3x!
4 / 112
2009
git
git
git
1
rpm -qa|grep i git git
[rocrocket@wupengchong ~]$ sudo su [root@wupengchong ~]# rpm -qa|grep -i git
libcapseo-0.2.0-0.1.20080603gita6ec446.fc9.i386
libcaptury-0.3.0-0.1.20080323gitcca4e3c.fc9.i386
xorg-x11-drv-nouveau-0.0.10-2.20080408git0991281.fc9.i386
xorg-x11-drv-digitaledge-1.1.1-1.fc9.i386
grep -i git/GIT/GiT grep

git git git
2
fedora yum git ubuntu apt-get
gentoo emerge git yum
[root@wupengchong ~]# yum list|grep ^git
git.i386
git-all.i386
5 / 112
1.5.5.1-1.fc9
1.5.5.1-1.fc9
updates-newkey
updates-newkey
2009
git
git-arch.i386
git-cvs.i386
git-daemon.i386
git-email.i386
git-gui.i386
git-svn.i386
gitk.i386
gitweb.i386
1.5.5.1-1.fc9
1.5.5.1-1.fc9
1.5.5.1-1.fc9
1.5.5.1-1.fc9
1.5.5.1-1.fc9
1.5.5.1-1.fc9
1.5.5.1-1.fc9
1.5.5.1-1.fc9
updates-newkey
updates-newkey
updates-newkey
updates-newkey
updates-newkey
updates-newkey
updates-newkey
updates-newkey
grep ^ git
git.i386 git allarchcvs
baidu
git git git git

git-all git
git-arch arch linux arch arch
git-arch arch gnu arch cvssccssvn git-arch gnu
arch git
git-cvs cvs git
git-daemon git:// git
git-email git
git-gui Tk git GUI git

git-svn svn git
6 / 112
git
2009
gitk Tcl/Tk GUI git git

git
gitweb web git web
3
[root@wupengchong ~]# yum install git-all.i386

Dependencies Resolved
================================================================================
Package
Arch
Version
Repository
Size
================================================================================
Installing:
git-all
i386
1.5.5.1-1.fc9
updates-newkey
9.0 k
Installing for dependencies:
cvsps
i386
2.1-6.fc9
fedora
55 k
emacs-common
i386
1:22.2-5.fc9
updates-newkey
19 M
emacs-git
i386
1.5.5.1-1.fc9
updates-newkey
53 k
git
i386
1.5.5.1-1.fc9
updates-newkey
3.5 M
git-arch
i386
1.5.5.1-1.fc9
updates-newkey
28 k
git-cvs
i386
1.5.5.1-1.fc9
updates-newkey
69 k
git-email
i386
1.5.5.1-1.fc9
updates-newkey
28 k
git-gui
i386
1.5.5.1-1.fc9
updates-newkey
177 k
git-svn
i386
1.5.5.1-1.fc9
updates-newkey
71 k
gitk
i386
1.5.5.1-1.fc9
updates-newkey
79 k
perl-Error
noarch
1:0.17012-2.fc9
fedora
27 k
7 / 112
git
perl-Git
i386
1.5.5.1-1.fc9
updates-newkey
18 k
perl-TermReadKey
i386
2.30-6.fc9
fedora
33 k
subversion-perl
i386
1.4.6-7
fedora
893 k
tla
i386
1.3.5-5.fc9
fedora
353 k
Transaction Summary
================================================================================
Install
16 Package(s)
Update
0 Package(s)
Remove
0 Package(s)
Total download size: 24 M
Is this ok [y/N]:
24M y
git
8 / 112
2009
git
2009
git
git git
git
(Revision control)
c
google
group
rcscvssvngitMercurialBazzar
gitMercurial Bazzar
1)
svk svn
9 / 112
git
SVN Git Git

git bzr
SVN windows TortoiseSVN
5) git Windows google code http://code.google.com/p/msysgit/
6) git http://www.githost.cn
2)
3)
4)
git
10 / 112
2009
git
2009
git
git
git google git http://git.or.cz/ git

git git git Documentation
git the stupid content tracker stupid git
stupid ^_^git
gittutorial(7) Everyday Git

man git-commandnamecvs gitcvs-migration(7) git Git Users Manual
man git-commandname
man git-log git man git-commit log
commit man git
gittutorial(7)
gittutorial(7)
The Git Users Manual
11 / 112
git
2009
1
git email
git config global user.name Your Name
git config global user.email you@example.com
[root@wupengchong ~]# git config global user.name rocrocket

[root@wupengchong ~]# git config global user.email wupengchong@gmail.com
2
git
email c main.c
rocrocket
[root@wupengchong git-study]# cd rocrocket/
[root@wupengchong rocrocket]# git init
Initialized empty Git repository in .git/
[root@wupengchong rocrocket]# ls -a
. .. .git main.c
[root@wupengchong rocrocket]# git add .
[root@wupengchong rocrocket]# git commit
Created initial commit df1d87d: This is the first git project.
1 files changed, 6 insertions(+), 0 deletions(-)
create mode 100644 main.c
git init shell .git

ls -a
git add . git snapshotgit
12 / 112
git
2009
index)
git commit git
git commit vi
13 / 112
git
git commit
14 / 112
2009
git
git
git
main.c helloworld
[root@wupengchong rocrocket]# cat -n main.c
1 #include<stdio.h>
2 int main()
3 {
4 printf(hello world!\n);
5 return 0;
6 }
main.c printf
printf(Version: 0.01\n);

1
#include<stdio.h>
2
int main()
3
{
4
5
printf(hello world!\n);
6
return 0;
7
}
15 / 112
2009
git
2009
[root@wupengchong rocrocket]# git diff cached

[root@wupengchong rocrocket]#
git diff cached index file working tree

index filecached working tree
index file working tree git diff
working tree main.c
[root@wupengchong rocrocket]# git diff
diff git a/main.c b/main.c
index 3a88d8c..e0fe92e 100644
a/main.c
+++ b/main.c
@@ -1,6 +1,7 @@
#include<stdio.h>
int main()
{
+printf(Version: 0.01\n);
printf(hello world!\n);
return 0;
}
git diff
git diff git status
[root@wupengchong rocrocket]# git status

# On branch master
16 / 112
git
# Changed but not updated:

#
(use git add <file> to update what will be committed)
#
#
modified:
main.c
#
no changes added to commit (use git add and/or git commit -a)
changed but not updated git git add

git Changes to be committed git git add git commit
git Untracked files
[root@wupengchong rocrocket]# git add main.c
git main.c git

new.c git add new.c git
[root@wupengchong rocrocket]# git commit

Created commit ecf78d1: This is the second version.
git
[root@wupengchong rocrocket]# git log

commit ecf78d1b3603d0f5015e8b14bee69870db6459e1
Author: rocrocket <wupengchong@gmail.com>
Date:
Thu Sep 18 15:39:47 2008 +0800
This is the second version.
Version 0.02
17 / 112
2009
git
2009
commit 3b1e328ad80caebe7fe2f4229e247d2ebe669cd8
Date:
Thu Sep 18 15:32:53 2008 +0800
This is the first git project.
At 20080916
git log Version0.02 git commit
git add git diff git status git commit

git log
git commit -a git add git diff git
commit
git commit -a
git add . git commit [ freeren ]
50
email log
(:))
ps::)
===
18 / 112
git
2009
git
git-add
add git add
add
log
git log
git log git log -p git
19 / 112
git
2009
git
SFD git
git
git
main.c main.c
git branch
[root@wupengchong rocrocket]# git branch experimental
[root@wupengchong rocrocket]#
[root@wupengchong rocrocket]# git branch

Experimental
* master
git branch git
20 / 112
git
2009
experimental
[root@wupengchong rocrocket]# git checkout experimental
Switched to branch experimental
checkout experimental
^_^
main.c
1
#include<stdio.h>
2
#include<time.h>
3
int main()
4
{
5
time_t mytime;
6
struct tm *mylocaltime;
7
mytime=time(NULL);
8
mylocaltime=localtime(&mytime);
9
printf(Year:%d\n,mylocaltime->tm_year+1900);
10
printf(Month:%d\n,mylocaltime->tm_mon+1);
11
printf(Day:%d\n,mylocaltime->tm_mday);
12
printf(Hour:%d\n,mylocaltime->tm_hour);
13
printf(Min:%d\n,mylocaltime->tm_min);
14
printf(Second:%d\n,mylocaltime->tm_sec);
15
16
printf(Hello world!\n);
17
return 0;
21 / 112
git
18
2009
[root@wupengchong rocrocket]# ./a.out

Year:2008
Month:9
Day:21
Hour:11
Min:17
Second:4
Version: 0.02
Hello world!
OK
[root@wupengchong rocrocket]# git commit -a

Created commit 0dff98a: This is a branch.
[root@wupengchong rocrocket]# git checkout master

Switched to branch master
log status experimental

git
22 / 112
git
2009
Welcome to roclinux.cnmain.c
1
#include<stdio.h>
2
int main()
3
{
4
printf(Welcome to roclinux.cn\n);
5
6
7
return 0;
8
}
git commit -a
experimental main.c
welcome main.c git commit -a
[root@wupengchong rocrocket]# git merge experimental

Auto-merged main.c
CONFLICT (content): Merge conflict in main.c
Automatic merge failed; fix conflicts and then commit the result.
conflict failed welcome
welcome main.c
[root@wupengchong rocrocket]# cat main.c
#include<stdio.h>
#include<time.h>
int main()
23 / 112
git
{
<<<<<<< HEAD:main.c
time_t mytime;
mytime=time(NULL);
>>>>>>> experimental:main.c
return 0;
}
2009
git =======
git welcome git
git
main.c
24 / 112
git
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
#include<stdio.h>
#include<time.h>
int main()
{
time_t mytime;
mytime=time(NULL);
return 0;
}
[root@wupengchong rocrocket]# git commit -a

Created commit 0120247: This is the new version!
[root@wupengchong rocrocket]# gitk
25 / 112
2009
git
git
26 / 112
2009
git
gitk gui
===
27 / 112
2009
git
git
gitk
[root@wupengchong rocrocket]# git branch -d experimental
Deleted branch experimental.
-d
-D -D
git branch D d
OK:)
===
28 / 112
2009
git
2009
git
git
1
/home/rocrocket/git-study/rocrocket (xiaoqiang)
xiaoqiang$ git clone /home/rocrocket/git-study/rocrocket myrepo

myrepo OK myrepo
git commit -a
cd /home/rocrocket/git-study/rocrocket
git pull /home/xiaoqiang/myrepo master
master
git pull
pull diff
ps: git
git
29 / 112
git
git()
1
man git-****
commit man git-commit
pull man git-pull
merge man git-merge
2
git git
#git config global user.name your name
#git config global user.email yourname@example.com
3
myproject
#cd myproject
#git init
#git add .
#git commit //
30 / 112
2009
git
2009
#git commit -a
// git add .; git commit;
git commit -a
git add . git commit [ freeren ]
5
#git diff // git add add

#git diff cached // git add git commit
#git status // git commit
#git log
#git log -p //
7
(experimental)master
#git branch experimental // experimental
#git branch //*
#git checkout experimental // experimental
#git commit -a // experimental commit

#git checkout master // master
#git merge experimental // exerimental
31 / 112
git
2009
#git commit -a // master

#git branch -d experimental // experimental
#git checkout master

#git branch -D experimental //-D
#gitk
9
bob rocrocket
bob$git clone /home/rocrocket/project myrepo // bob myrepo
/home/rocrocket chmod o+rx /home/rocrocket
bob
bob$git commit -a //bob git rocrocket
bob
$ cd /home/rocrocket/project
$ git pull /home/bob/myrepo //pull git (git-fetch)(git-merge)
rocrocketgit pull . git merge
git pull . git merge git-pull /home/bob chmod o+rx
/home/bob
bob
$ cd /home/rocrocket/project
$ git fetch /home/bob/myrepo master:bobworks // bob rocrocket
bobworks master bob
32 / 112
git
2009
merge master git branch -D

$git whatchanged -p master..bobworks // bob
$git checkout master // master
$git pull . bobworks // bob pull bobworks
$git branch -D bobworks // bob -D
bob clone myrepo

git pull
#git pull // clone git rocrocket
===
git
1
git commitcommit
[rocrocket@wupengchong project]$ git log
commit 5b888402aadd3cd41b3fe8c84a8658da07893b20
Date:
Wed Sep 24 13:16:46 2008 +0800
after pull from rocrocket
Hello!!!!!
2
git show commit commit
33 / 112
git
[rocrocket@wupengchong project]$ git show 5b888402aadd3cd41b3fe8c84a8658da07893b20
commit
[rocrocket@wupengchong project]$ git show 5b888 //
git show
[rocrocket@wupengchong project]$git show master

[rocrocket@wupengchong project]$git show experimental
HEAD commit
[rocrocket@wupengchong project]$git show HEAD
commit parent commit^ parent
[rocrocket@wupengchong project]$git show HEAD^ // HEAD

[rocrocket@wupengchong project]$git show HEAD^^ // HEAD
[rocrocket@wupengchong project]$git show HEAD~4 // HEAD 4
git-merge
[rocrocket@wupengchong project]$git show HEAD^1 // HEAD

[rocrocket@wupengchong project]$git show HEAD^2 // HEAD
[rocrocket@wupengchong project]$ git tag V3 5b888 // V3 (5b888)

[rocrocket@wupengchong project]$ git show V3
[rocrocket@wupengchong project]$ git branch stable V3 // V3
4
git grep
[rocrocket@wupengchong project]$ git grep print V3 // V3 print
[rocrocket@wupengchong project]$ git grep print // print
34 / 112
2009
git
2009
[rocrocket@wupengchong project]$ git log V3..V7 // V3 V7

[rocrocket@wupengchong project]$ git log V3.. // V3 <since>..<until>
HEAD..<until>git log
[rocrocket@wupengchong project]$ git log since=2 weeks ago // 2
git-ref-parse
[rocrocket@wupengchong project]$ git log stable..experimental // experimental stable
[rocrocket@wupengchong project]$ git log experimental..stable // stable experimental
6
gitk
[rocrocket@wupengchong project]$ gitk since=2 weeks ago drivers/ // GUI 2

drivers
===
git
:)
35 / 112
git
2009
git
~ git
object database
1
object database git
$ mkdir test-project
$ cd test-project
$ git init
$ echo Hi,rocrocket>file.txt
$ git add .
$ git commit -a -m initial commit //-m
$ echo Hi,rocrocket!>file.txt
$ git commit -a -m add emphasis
$ git log // log
Created commit d85012f: add emphasis
[rocrocket@wupengchong test-project]$ git log
commit d85012f4d17a774c7286f4d7d022f022d3b90073
36 / 112
git
2009
Date:
Fri Sep 26 10:58:15 2008 +0800
add emphasis
commit 241e0a4d2a5644f92737b7fba8b9eb19dcb0c345
Date:
Fri Sep 26 10:57:13 2008 +0800
initial commit
commit 40
40 commit 40
SHA1 Secure Hash Algorithm commit
2
[rocrocket@wupengchong test-project]$ git cat-file -t 241e //cat-file -t ID

241e commit SHA1
commit // ID commit
[rocrocket@wupengchong test-project]$ git cat-file commit 241e // commit
commit ID
tree 9a327d5e3aa818b98ddaa7b5b369f5deb47dc9f6
author rocrocket <wupengchong@gmail.com> 1222397833 +0800
committer rocrocket <wupengchong@gmail.com> 1222397833 +0800
initial commit
treetree ID BLOB
tree ls-tree tree
[rocrocket@wupengchong test-project]$ git ls-tree 9a327
100644 blob 7d4e0fa616551318405e8309817bcfecb7224cff file.txt
37 / 112
git
2009
9a327 file.txt ID 7d4e0f

[rocrocket@wupengchong test-project]$ git cat-file -t 7d4e0f
blob
[rocrocket@wupengchong test-project]$ git cat-file blob 7d4e0f
Hi,rocrocket
7d4e0f blobHi,rocrocket
3
.git/objects/ find
./objects
./objects/pack
./objects/24
./objects/24/1e0a4d2a5644f92737b7fba8b9eb19dcb0c345
./objects/fb
./objects/fb/4ec0f35525992eda56021f161f85f637837404
./objects/d8
./objects/d8/5012f4d17a774c7286f4d7d022f022d3b90073
./objects/7d
./objects/7d/4e0fa616551318405e8309817bcfecb7224cff
./objects/9a
./objects/9a/327d5e3aa818b98ddaa7b5b369f5deb47dc9f6
./objects/info
./objects/60
./objects/60/be00dabc677b196938758ef41457cc17b77b70
blobtreecommit tag
38 / 112
git
2009
4
.git HEAD .git/HEAD
[rocrocket@wupengchong .git]$ cat HEAD
ref: refs/heads/master
[rocrocket@wupengchong .git]$ cd ..
[rocrocket@wupengchong test-project]$ git branch
* master
HEAD master HEAD

refs/heads/master HEAD
[rocrocket@wupengchong test-project]$ cat .git/refs/heads/master
d85012f4d17a774c7286f4d7d022f022d3b90073
ID
[rocrocket@wupengchong test-project]$ git cat-file -t d850
commit
[rocrocket@wupengchong test-project]$ git cat-file commit d850
tree fb4ec0f35525992eda56021f161f85f637837404
parent 241e0a4d2a5644f92737b7fba8b9eb19dcb0c345
author rocrocket <wupengchong@gmail.com> 1222397895 +0800
committer rocrocket <wupengchong@gmail.com> 1222397895 +0800
add emphasis
HEAD commit parent commit

5
commit tree tree parentcommit
39 / 112
git
commit
tree tree blob
blob
HEAD .git/refs/heads .git/HEAD
git
index file
git commit -a
commit
1
test-project
[rocrocket@wupengchong test-project]$ echo hello world,again>>file.txt
commit git diff
[rocrocket@wupengchong test-project]$ git diff

diff git a/file.txt b/file.txt
index 60be00d..a559610 100644
a/file.txt
+++ b/file.txt
@@ -1 +1,2 @@
Hi,rocrocket!
+hello world,again
40 / 112
2009
git
2009
git add git diff diff

[rocrocket@wupengchong test-project]$ git add file.txt
[rocrocket@wupengchong test-project]$ git diff
[rocrocket@wupengchong test-project]$
add git diff commit git diff HEAD
[rocrocket@wupengchong test-project]$ git diff HEAD

index 60be00d..a559610 100644
a/file.txt
+++ b/file.txt
@@ -1 +1,2 @@
Hi,rocrocket!
+hello world,again
git diff HEAD
index file.git/index ls-files

[rocrocket@wupengchong test-project]$ git ls-files stage // index file
100644 a55961026a22bdd4e938dcc90a4a83823a81f776 0
file.txt
[rocrocket@wupengchong test-project]$ git cat-file -t a5596
blob
[rocrocket@wupengchong test-project]$ git cat-file blob a5596
Hi,rocrocket!
hello world,again
41 / 112
git
2009
git-diff
git add blob index file blob
2
git-diff HEAD git-diff
[rocrocket@wupengchong test-project]$ echo again?>>file.txt
[rocrocket@wupengchong test-project]$ git diff HEAD
index 60be00d..dfb67dc 100644
a/file.txt
+++ b/file.txt
@@ -1 +1,3 @@
Hi,rocrocket!
+hello world,again
+again?
cached index file
[rocrocket@wupengchong test-project]$ git diff cached

index 60be00d..a559610 100644
a/file.txt
+++ b/file.txt
@@ -1 +1,2 @@
Hi,rocrocket!
+hello world,again
42 / 112
git
2009
git <->index file<->git

git commit index file git git add index filecommit -a
index filegit
git diff Lee.MaRS
Lee.MaRS
Current working directory (1)
Index file (2)
Git repository (3)
(1) -> (2) -> (3)
git add (1) -> (2)
git commit (2) -> (3)
git commit -a
(1)(2)(3)
(1) <- (2) <- (3)
git diff (2)(1)
git diff cached (3)(2)
git diff HEAD (3)(1)
3
status
[rocrocket@wupengchong test-project]$ git status
# On branch master
# Changes to be committed:
43 / 112
git
#
(use git reset HEAD <file> to unstage)
#
#
modified:
file.txt
#
#
#
#
modified:
file.txt
#
2009
Changes to be committed index commit Changed but not updated

index
ps: Everyday Git.
===
44 / 112
git
git
git
1)
2)
3)
4)
5)
Basic Repository Command git

Individual Developer (Standalone)
Individual Developer (Participant)
Integrator
Repository Administration
ps:
===
45 / 112
2009
git
2009
git
basic repository
1
git-init git-clone git

git-fsck
git-gc
2
git-init
git-init git
git-init .git .git objects, refs/heads, refs/tags
master HEAD
$GIT_DIR git-init ./.git $GIT_DIR
$GIT_OBJECT_DIRECTORY SHA1
SHA1 $GIT_DIR/objects
git-initgit-init
git git-
46 / 112
git
2009
init
git-init git-init-db git git-init-db init
db init db git-init
===
47 / 112
git
git
git-clone git
git
rsync://host.xz/path/to/repo.git/
http://host.xz/path/to/repo.git/
https://host.xz/path/to/repo.git/
git://host.xz/path/to/repo.git/
git://host.xz/~user/path/to/repo.git/
ssh://[user@]host.xz[:port]/path/to/repo.git/
ssh://[user@]host.xz/path/to/repo.git/
ssh://[user@]host.xz/~user/path/to/repo.git/
ssh://[user@]host.xz/~/path/to/repo.git
git
/path/to/repo.git/
file:///path/to/repo.git/
===
48 / 112
2009
git
git
git
1
git
git-show-branch
git-log
git-checkout git-branch
git-add index
git-diff git-status
git-commit git
git-reset git-checkout
git-merge
git-rebase topic git
git-tag
2
git
tarball
$ tar -xzvf mypro.tat.gz
$ cd mypro
49 / 112
2009
git
$
$
$
$
2009
git-init
git add .
git commit -m important of mypro source tree.
git tag v2.43 // commit v2.43
$ git checkout -b alsa-audio //-b alsa-audio

(//)
$ git checkout curses/ux_audio_oss.c // curses/ux_audio_oss.c
$ git add curses/ux_audio_alsa.c // git-add git
git-commit -a git
(//)
$ git diff HEAD // commit
$ git commit -a -s //
(//)
$ git reset soft HEAD^ // commit soft index file working tree
(//)
$ git diff ORIG_HEAD //look at the changes since the premature commit we took back
$ git commit -a -c ORIG_HEAD //-c ORIG_HEAD
$ git checkout master
$ git merge alsa-audio
$ git log since=3 days ago
$ git log v2.43.. curses/
// v2.43 curses
===
50 / 112
git
2009
git
git
1
git
git-clone git
git-pull git-fetch git
git-push CVS
git-format-patch
2
$git clone git://git.kernel.org/pub/scm//torvalds/linux-2.6 my2.6

$cd my2.6
()
$git commit -a -s //-s commit
$git format-patch origin // patch email
$git pull // origin
$git log -p ORIG_HEAD.. arch/i386 include/asm-i386
$git pull git://git.kernel.org/pub//jgarzik/libata-dev.git ALL // git
51 / 112
git
$git reset hard ORIG_HEAD //

$git gc // reset
$git fetch tags // origin tags .git/refs/tags
3
git
Integator admin :)
===
52 / 112
2009
git
git()
1 commit commit -a
2 log -p -p
3 merge
4 fetch
5 pull
6 commit
7 HEAD ORIG_HEAD
8 tag
===
1
commit commit -a
commit -a
53 / 112
2009
git
2009
add index file

index file
commit
2
log -p -p
git log commit
git log -p commit commit
3
merge
git-merge
git merge branchname branchname ()
merge
git merge index file
git diff
index file git commit
git filename.txt needs merge
git status
git add filename.txt

git commit
merge
$ git reset hard HEAD //hard working tree index file
54 / 112
git
2009
,soft commit working tree index file mixed commit

index file working tree OKhardmixed soft
4
fetch
git-fetch reposoitory objects refs
git fetch <options> <repository> <refspec>
<repository>
<refspec><src>:<dst><src><dst>
git fetch /home/bob/myrepo master:bobworks bob master objects refs

bobworks
5
pull
git-pull repository repository
git pull git fetch git merge
git pull /home/bob/myrepo
git pull . git merge
6
commit
git log commit
[rocrocket@wupengchong project]$ git log
55 / 112
git
commit 5b888402aadd3cd41b3fe8c84a8658da07893b20
Date:
Wed Sep 24 13:16:46 2008 +0800
after pull from rocrocket
Hello!!!!!
2009
commit ID git show commit

git diff
7
HEAD commit
MERGE_HEAD merge commit HEAD
FETCH_HEAD git-fetch object ref git-merge
HEAD^ HEAD
HEAD^^ HEAD
HEAD~4 HEAD
HEAD^1 HEAD
HEAD^2 HEAD
COMMIT_EDITMSG commit
8
tag
commit
[rocrocket@wupengchong project]$ git tag V3 5b888 // V3 (5b888)
[rocrocket@wupengchong project]$ git show V3
56 / 112
git
2009
ps: git
git
===
57 / 112
git
2009
git
git-diff
git working tree, index file, commit
working tree working tree

index file working tree commit git-add index file
index file working tree
commit commit git git-commit index file
commit
git diff working tree index file

git diff cached index file commit
git diff HEAD working tree commit HEAD commit
test-git c
[rocrocket@wupengchong test-git]$ cat main.c
#include<stdio.h>
58 / 112
git
int main(int argc,char *argv[])

{
printf(hello.\n);
printf(he was a student.\n);
return 0;
}
git init, git add . , git commit;

#include<stdio.h>
{
printf(hello.\n);
printf(he was born in finland.\n);
return 0;
}
git add . git commit

#include<stdio.h>
{
printf(hello.\n);
59 / 112
2009
git

printf(he is very clever!\n);
return 0;
}
$ git diff
$ git diff cached
$ git diff HEAD
2009
git diff git status
[rocrocket@wupengchong test-git]$ git status

# On branch master
# Changes to be committed:
#
(use git reset HEAD <file> to unstage)
#
#
modified:
main.c
#
#
#
#
modified:
main.c
#
Changes to be committed index file

Changed but not updated working tree git add index file
60 / 112
git
git
git branch git checkout branchname
git branch
git branch branchname branchname
working tree index file commit commit
git branch branchname commit
test-git c
#include<stdio.h>
{
printf(hello.\n);
return 0;
}
git init, git add . , git commit;

#include<stdio.h>
61 / 112
2009
git
{
printf(hello.\n);
return 0;
}
git add . git commit

#include<stdio.h>
{
printf(hello.\n);
printf(he is very clever!\n);
return 0;
}
2009
git working treeindex file commit

git
[rocrocket@wupengchong test-git]$ git branch experimental

experimental git checkout experimental
cat main.c
62 / 112
git

#include<stdio.h>
{
printf(hello.\n);
return 0;
}
2009
master commit
OK
ps git branch .git/refs/heads
commit
ps: git branch checkout .git
HEAD commit
===
63 / 112
git
2009
git
:D
1)
2)
3)
4)
5)
6)
7)
master roc.c
wukong wukong roc.c commit
wukong bajie roc.c bajie commit
wukong bajie
bajie wukong
wukong master
master
[rocrocket@wupengchong
64 / 112
~]$ mkdir git21

~]$ cd git21/
git21]$ ls
git21]$ vi roc.c
git21]$ ls
git
roc.c
[rocrocket@wupengchong git21]$ cat -n roc.c
1 #include<stdio.h>
2 int main()
3 {
4
printf(Please guess who he is.\n);
5
return 0;
6 }
[rocrocket@wupengchong git21]$
[rocrocket@wupengchong git21]$ git init

[rocrocket@wupengchong git21]$ git add *
[rocrocket@wupengchong git21]$ git commit
Created initial commit d5d44dc: master:001
create mode 100644 roc.c
[rocrocket@wupengchong git21]$ git diff

[rocrocket@wupengchong git21]$ git diff cached
[rocrocket@wupengchong git21]$ git diff HEAD
[rocrocket@wupengchong git21]$ git log
commit d5d44dcdc938a263bdbc1c9cb06de24c27adebc7
65 / 112
2009
git
Date:
Thu Oct 9 18:50:39 2008 +0800
master:001
[rocrocket@wupengchong git21]$ git status
# On branch master
nothing to commit (working directory clean)
[rocrocket@wupengchong git21]$ git branch
* master
2009
wukong wukong roc.c

commit
* master
wukong
Switched to branch wukong
master
* wukong
ref: refs/heads/wukong
roc.c
roc.c
66 / 112
git branch wukong

git branch
git checkout wukong

git branch
cat .git/HEAD
ls
vi roc.c
git

1 #include<stdio.h>
2 int main()
3 {
4
5
printf(He is a youngster.\n);
6
return 0;
7 }
add
[rocrocket@wupengchong git21]$ git add roc.c

diff git a/roc.c b/roc.c
index 66cb6f0..2fe0f42 100644
a/roc.c
+++ b/roc.c
@@ -2,5 +2,6 @@
int main()
{
+
return 0;
}
67 / 112
2009
git
wukong
Created commit 1ac0798: wukong:001
commit 1ac0798784828577ecb808b03165facfb5bef3e3
Date:
Thu Oct 9 19:07:57 2008 +0800
wukong:001
Date:
Thu Oct 9 18:50:39 2008 +0800
master:001
master wukong

master
* wukong
[rocrocket@wupengchong git21]$ cat roc.c
#include<stdio.h>
int main()
{
return 0;
68 / 112
2009
git
}
[rocrocket@wupengchong git21]$ git checkout master
* master
wukong
#include<stdio.h>
int main()
{
return 0;
}
:)
3 wukong bajie roc.c bajie commit
master
* wukong
bajie
master
69 / 112
git checkout wukong

git branch
git branch bajie

git branch
2009
git
* wukong
[rocrocket@wupengchong git21]$ git checkout bajie
Switched to branch bajie
* bajie
master
wukong
[rocrocket@wupengchong git21]$ vi roc.c
bajie checkout bajie

bajie roc.c

1 #include<stdio.h>
2 int main()
3 {
4
5
6
printf(He is a male.\n);
7
return 0;
8 }
He is a male.

70 / 112
2009
git
index 2fe0f42..05aaf78 100644

a/roc.c
+++ b/roc.c
@@ -3,5 +3,6 @@ int main()
{
+
return 0;
}
[rocrocket@wupengchong git21]$ git add roc.c
Created commit 5a0f9ee: bajie:001
commit 5a0f9ee71fe9ffe259b9b6cf842dd69baa95b307
Date:
Thu Oct 9 19:16:31 2008 +0800
bajie:001
Date:
Thu Oct 9 19:07:57 2008 +0800
wukong:001
71 / 112
2009
git
Date:
Thu Oct 9 18:50:39 2008 +0800
master:001
* bajie
master
wukong
2009
bajie log
log merge Log
4 wukong bajie
* bajie
master
wukong
bajie
master
* wukong
git branch
git checkout wukong

git branch
vi roc.c
wukong roc.c

1 #include<stdio.h>
72 / 112
git
2 int main()
3 {
4
5
6
printf(He is a female.\n);
7
return 0;
8 }
2009
wukong He is a female. bajie

He is a male.
commit merge
merge
[rocrocket@wupengchong git21]$ git merge bajie
Updating 1ac0798..5a0f9ee
roc.c: needs update
error: Entry roc.c not uptodate. Cannot merge.
roc.c merge
wukong commit

index 2fe0f42..b8066c1 100644
a/roc.c
+++ b/roc.c
@@ -3,5 +3,6 @@ int main()
73 / 112
git
{
+
return 0;
}
[rocrocket@wupengchong git21]$ git commit -a
Created commit 4f6ba4e: wukong:002
commit 4f6ba4e96db6110405f615a5ea5d3119faf64d45
Date:
Thu Oct 9 23:35:31 2008 +0800
wukong:002
Date:
Thu Oct 9 19:07:57 2008 +0800
wukong:001
Date:
Thu Oct 9 18:50:39 2008 +0800
master:001
5 bajie wukong
[rocrocket@wupengchong git21]$ git merge bajie

Auto-merged roc.c
74 / 112
2009
git
2009
CONFLICT (content): Merge conflict in roc.c

bajie wukongconflict
merge roc.c

#include<stdio.h>
int main()
{
<<<<<<< HEAD:roc.c
=======
>>>>>>> bajie:roc.c
return 0;
}
male female male

#include<stdio.h>
int main()
{
75 / 112
git

return 0;
}
merge commit
[rocrocket@wupengchong git21]$ git

diff cc roc.c
index b8066c1,05aaf78..0000000
a/roc.c
+++ b/roc.c
Created commit e1ca782: wukong:003
commit
diff
add roc.c
diff
commit
git log
commit e1ca782d95176e83d1013361ba88d0b4c2f51f50
Merge: 4f6ba4e 5a0f9ee
Date:
Thu Oct 9 23:43:06 2008 +0800
wukong:003
Merge branch bajie into wukong
76 / 112
2009
git
Conflicts:
roc.c
commit 4f6ba4e96db6110405f615a5ea5d3119faf64d45
Date:
Thu Oct 9 23:35:31 2008 +0800
wukong:002
commit 5a0f9ee71fe9ffe259b9b6cf842dd69baa95b307
Date:
Thu Oct 9 19:16:31 2008 +0800
bajie:001
Date:
Thu Oct 9 19:07:57 2008 +0800
wukong:001
Date:
Thu Oct 9 18:50:39 2008 +0800
master:001
log git merge log

6 wukong master
master
master
77 / 112
2009
git

bajie
* master
wukong
merge
[rocrocket@wupengchong git21]$ git merge wukong

Updating d5d44dc..e1ca782
Fast forward
roc.c |
2 ++
master roc.c

1
#include<stdio.h>
2
int main()
3
{
4
5
6
7
return 0;
8
}
youngster male
78 / 112
2009
git
2009
7
master
bajie
[rocrocket@wupengchong git21]$ git branch -d bajie
Deleted branch bajie.
-d
-D d
-D wukong
[rocrocket@wupengchong git21]$ git branch -D wukong
Deleted branch wukong.
merge
-D -d :)
git You can
count on me!^_^
===
79 / 112
git
2009
git
git branch D -d
-D -d 12

master wukong
wukong commit master commit master -D -d
master merge wukong -d -D

master merge wukong wukong master wukong
-d
[rocrocket@wupengchong git22]$ git branch -d wukong
error: The branch wukong is not an ancestor of your current HEAD.
If you are sure you want to delete it, run git branch -D wukong.
-D

wukong commit master -D -d
80 / 112
git
2009
commit master
wukong commit wukong

wukong master -d wukong
[rocrocket@wupengchong git23]$ git branch -d wukong

error: The branch wukong is not an ancestor of your current HEAD.
If you are sure you want to delete it, run git branch -D wukong.
wukong -D
-d master wukong commit

-D -d
ps: google, baidu,tencent,redhat,
===
81 / 112
git
2009
git
clone pull
1 rocrocket git master roc.c wukong
roc.c wukong commit master master roc.c
2 bob clone rocrocket
3 bob rocrocket master rocrocket pull bob
1 rocrocket git master roc.c wukong

roc.c wukong commit master master roc.c
[rocrocket@wupengchong git23]$ ls
roc.c
# On branch master
#
# Initial commit
#
# Untracked files:
82 / 112
git
#
(use git add <file> to include in what will be committed)
#
#
roc.c
nothing added to commit but untracked files present (use git add to track)
[rocrocket@wupengchong git23]$ git add .
Created initial commit d3d0679: rocrocket:master:001
2009
git commit -a index file

git add index file
wukong
[rocrocket@wupengchong git23]$ git branch wukong
[rocrocket@wupengchong git23]$ git checkout wukong
Created commit aad38ac: rocrocket:wukong:001
1 #include<stdio.h>
2 int main()
3 {
4
83 / 112
git
5
printf(He is born in beijing.\n);
6
return 0;
7 }
2009
master wukong commit master

master commit
1
#include<stdio.h>
2
int main()
3
{
4
5
printf(He is crazy about linux.\n);
6
return 0;
7
}
[rocrocket@wupengchong git23]$ pwd
/rocrocket/PSB/home/git23
master He is crazy about linux. git commit.

2 bob clone rocrocket
[bob@wupengchong ~]$ whoami

bob
[bob@wupengchong ~]$ git clone /rocrocket/PSB/home/git23 bob23
84 / 112
git
Initialized empty Git repository in /rocrocket/PSB/bob/bob23/.git/

[bob@wupengchong ~]$ ls
bob23
[bob@wupengchong ~]$ cd bob23/
[bob@wupengchong bob23]$ cat -n roc.c
1 #include<stdio.h>
2 int main()
3 {
4
5
return 0;
6 }
[bob@wupengchong bob23]$ git branch
* master
2009
bob rocrocket clone bob bob23

clone rocrocket master commit master
rocrocket wukong clone git clone clone
clone clone rocrocket
wukong rocrocket chekcout wukong clone OK bob23
git branch wukong git master
By the way, git checkout branchname commit git
[rocrocket@wupengchong git23]$ git checkout wukong
rocrocket commit commit
85 / 112
git
* master
wukong
Created commit fadfdb4: rocrocket:master:002
3 bob rocrocket master rocrocket pull bob
[bob@wupengchong bob23]$ ls
roc.c
* master
[bob@wupengchong bob23]$ cat roc.c
#include<stdio.h>
int main()
{
return 0;
}
[bob@wupengchong bob23]$ vi roc.c
1
#include<stdio.h>
2
int main()
3
{
4
5
printf(His name is roc.\n);
6
return 0;
86 / 112
2009
git
7
}
[bob@wupengchong bob23]$ git commit -a
Created commit 7c1cd89: bob:master:001
rocrocket pull pull

#include<stdio.h>
int main()
{
return 0;
}
[rocrocket@wupengchong git23]$ git pull /rocrocket/PSB/bob/bob23
Unpacking objects: 100% (3/3), done.
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (2/2)remote: , done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Auto-merged roc.c
CONFLICT (content): Merge conflict in roc.c
rocrocket bob git pull conflict
87 / 112
2009
git

1
#include<stdio.h>
2
int main()
3
{
4
5
6
printf(His name is roc.\n);
7
return 0;
8
}
commit
[rocrocket@wupengchong git23]$ git commit a
Created commit ed92cd2: new pull!
bob rocrocket
===
88 / 112
2009
git
2009
git
pull master
project manager
master
git
rocrocket git24 roc.c bob git clone git24 bob24
[bob@wupengchong ~]$ git clone /rocrocket/PSB/home/git24 bob24

Initialized empty Git repository in /rocrocket/PSB/bob/bob24/.git/
[bob@wupengchong ~]$ ls
bob24
[bob@wupengchong ~]$
clone bob
[bob@wupengchong ~]$ cd bob24/

[bob@wupengchong bob24]$ ls
roc.c
* master
89 / 112
git
2009
[bob@wupengchong bob24]$ vi roc.c

1
#include<stdio.h>
2
int main()
3
{
4
printf(Hello,everyone!\n);
5
printf(Good bye!\n);
6
}
[bob@wupengchong bob24]$ git commit -a
Created commit 42b7069: bob:001
[bob@wupengchong bob24]$
bob
rocrocket PM
[rocrocket@wupengchong git24]$ git fetch /rocrocket/PSB/bob/bob24 master:bob

Unpacking objects: 100% (3/3), done.
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (2/2)remote: , done.
remote: Total 3 (delta 0), reused 0 (delta 0)
From /rocrocket/PSB/bob/bob24
* [new branch]
master
-> bob
PM fetch bob
90 / 112
git
2009
git pull
bob
* master
Switched to branch bob
roc.c
#include<stdio.h>
int main()
{
}
git branch
git checkout bob

ls
cat roc.c
bob
git-whatchanged
[rocrocket@wupengchong git24]$ git-whatchanged -p master..bob
commit 42b706951ed78bad6ce716f61ca56fe63ad61067
Author: bob <bob@roclinux.cn>
Date:
Fri Oct 10 15:03:30 2008 +0800
bob:001
index 33e540b..885aa26 100644
91 / 112
git
2009
a/roc.c
+++ b/roc.c
@@ -2,4 +2,5 @@
int main()
{
+
}
PM master

[rocrocket@wupengchong git24]$ git pull . bob
Updating dfa52c4..42b7069
Fast forward
roc.c |
1 +
git pull merge

git-pull .
git-pull bob
git-pull
PM git fetch git-whatchanged
92 / 112
git
git pull
93 / 112
2009
git
2009
git
git reset
git reset
1 git reset soft
2 git reset hard
3 git reset mixed
4 git reset
5 git reset
1 git reset soft

[rocrocket@wupengchong ~]$ mkdir git25
[rocrocket@wupengchong ~]$ cd git25/
1 #include<stdio.h>
2 int main()
3 {
4
printf(He is a young man.\n);
5
return 0;
94 / 112
git
6 }
[rocrocket@wupengchong git25]$ git add .
[rocrocket@wupengchong git25]$ git commit -m 1
Created initial commit a2909db: 1
commit a2909db30720fe7bb85724fdfad89b5ffd280b05
Date:
Wed Oct 15 08:46:20 2008 +0800
1
1 #include<stdio.h>
2 int main()
3 {
4
5
printf(He is 24 years old.\n);
6
return 0;
7 }
[rocrocket@wupengchong git25]$ git commit -a -m 2
Created commit 5fcb5ab: 2
95 / 112
2009
git

commit 5fcb5abeee4dea39da8946bd39c6daea19977558
Date:
Wed Oct 15 08:47:10 2008 +0800
2
Date:
Wed Oct 15 08:46:20 2008 +0800
1
2009
git commit
commit 24 25 commitsoft
[rocrocket@wupengchong git25]$ git reset soft HEAD^

Date:
Wed Oct 15 08:46:20 2008 +0800
1
index b089322..ee25766 100644
a/roc.c
+++ b/roc.c
@@ -2,5 +2,6 @@
96 / 112
git
int main()
{
+
return 0;
}
[rocrocket@wupengchong git25]$ git diff HEAD
index b089322..ee25766 100644
a/roc.c
+++ b/roc.c
@@ -2,5 +2,6 @@
int main()
{
+
return 0;
}
1 #include<stdio.h>
2 int main()
3 {
4
5
6
return 0;
97 / 112
2009
git
7 }
2009
git reset git diff git diff cached git

diff HEAD soft commit index file
commit commit soft
git reset
commit HEAD^
2 git reset hard
soft hard
hard commit commit working tree
commit hard git diffgit diff cached git diff HEAD
hard current working tree git add
add git reset hard HEAD git add
git reset commit git
reset HEAD commit
3 git reset mixed
mixed commit working tree index file commit
commit mixed git diff git diff HEAD git diff cached
4 git reset
mixed git reset git reset git reset mixed
5 git reset
index file
98 / 112
git
2009
index file roc.c$ git reset roc.c

git add index file
git reset
99 / 112
git
2009
git
git reset N reset working treeindex
file commit
git reset
1 git reset soft commit working tree index file
2 git reset hard commitindex file working tree commit
3 git reset mixed commit index file working tree
4 git reset git reset mixed
5 git reset index file
100 / 112
git
2009
git
git-show-branch git branch
[rocrocket@wupengchong cloneteset]$ git show-branch

* [master] 1
! [wukong] 5
-+ [wukong] 5
+ [wukong^] bajie
+ [wukong~2] 2
*+ [master] 1
[rocrocket@wupengchong cloneteset]$ git branch
* master
wukong
[rocrocket@wupengchong cloneteset]$
git show-branch
git
[rocrocket@wupengchong showbranch]$ cat roc.c

int main()
101 / 112
git
{
printf("Firstly");
return 0;
}
[rocrocket@wupengchong showbranch]$ git branch
* master
[rocrocket@wupengchong showbranch]$ git show-branch
[master] Firstly
[rocrocket@wupengchong showbranch]$ git log
commit b11be45d63226eac8b89fa05119d4282cfd73df2
Author: rocrocket ;
Date:
Fri Nov 14 12:00:18 2008 +0800
Firstly
[rocrocket@wupengchong showbranch]$
commit git show-branch

commit Firstly
roc.c Secondly
[rocrocket@wupengchong showbranch]$ cat roc.c
int main()
{
printf("Firstly");
printf("Secondly");
return 0;
}
102 / 112
2009
git
2009
[rocrocket@wupengchong showbranch]$ git log

commit 5102e1a2c812dfa6539d77f1ecede46faaa26c4f
Author: rocrocket ;
Date:
Fri Nov 14 12:04:54 2008 +0800
Secondly
commit b11be45d63226eac8b89fa05119d4282cfd73df2
Author: rocrocket ;
Date:
Fri Nov 14 12:00:18 2008 +0800
Firstly
[master] Secondly
git show-branch master commit Firstly
wukong
[rocrocket@wupengchong showbranch]$ git branch wukong

[rocrocket@wupengchong showbranch]$ git branch
* master
wukong
* [master] Secondly
! [wukong] Secondly
103 / 112
git
-*+ [master] Secondly

[rocrocket@wupengchong showbranch]$ git checkout wukong
Switched to branch "wukong"
[rocrocket@wupengchong showbranch]$ git-show-branch
! [master] Secondly
* [wukong] Secondly
-+* [master] Secondly
2009
git show-branch *!
git-show-branch !*
!*
* HEAD !
!*!*
! master *
wukong (OK,
)
commit
104 / 112
git
2009
+ commit
commit
- merge merge
*++*

* [master] merge
! [wukong] wukong:Thirdly
-- [master] merge
*+ [wukong] wukong:Thirdly
master wukong
master HEAD commit merge wukong HEAD
commit wukong: Thirdly
-master HEAD commit merge merge
commit merge- commit wukong
*+ commit master wukong

commit merge wukong commit
105 / 112
git
wukong: Thirdly merge master

ok~ git-show-branch

! [bajie] shaseng:Secondly
* [master] Fourth
! [shaseng] shaseng:Secondly
! [wukong] shaseng:Secondly
---[master] Fourth
+*++ [bajie] shaseng:Secondly
over~
106 / 112
2009
git
2009
git
fedora 10 git
git
git
git yaoming yaoming

cprsync rcp .git
yaoming yaoming git-init git
OK
git-init git git fatal: Not a git
repository logbranch ~~
ove~
107 / 112
git
git
git
fedora 9 federa 10 git Fat32
fedora 10 git fedora 10
git commit git
[rocrocket@rocrocket Anycatch]$ git commit -a -F devlog/log-0.0.5
*
* You have some suspicious patch lines:
*
* In anycatch.c
* trailing whitespace (line 63)
anycatch.c:63:
struct in_addr inp;
anycatch.c:66:
sscanf(strline,%s %u,str_ip,&_port);
anycatch.c:133:
read_IP_list(strline);
anycatch.c:135:
read_IP_sched(strline);
* In anycatch.h
108 / 112
2009
git
anycatch.h:153:
IpAddress ip;
* In devlog/template-0.0.1
devlog/template-0.0.1:6:DETAIL:
.git/hooks/pre-commit
if (/\s$/) {
bad_line("trailing whitespace", $_);
}
over~
109 / 112
2009
git
2009
git
FreeBSD git
git http://zh-tw.whygitisbetterthanx.com
git GitHub baidu/google
GitHub 100M repo :)
over~~
110 / 112
git
2009
git
:)
1 git clone git working tree index file git clone
git clone path/to/your/repo newrepo
path/to/your/repo git
fetch path/to/his/newrepo hisbranch:yourbranch yourbranch
git merge
2 git whatchanged -p branch1..branch2-p
-p git :)
3 git pull git clone git pull git pull . git merge
git pull /path/to/repo merge git pull
/path/to/repo <src>:<dst>
4 git commit tree blob tag
5 git-push CVS git git pull git
push
6 git fetch <> <><>
<src>:<dst><src><dst><dst>
7 commit git checkout
111 / 112
git
8 index file git reset filename

9 git checkout filename index
over~
112 / 112
2009

最好的git中文教程

Uploaded by

Document Information

Copyright

Available Formats

Share this document

Share or Embed Document

Sharing Options

Did you find this document useful?

Is this content inappropriate?

Copyright:

Available Formats

最好的git中文教程

Uploaded by

Copyright:

Available Formats

git

rocrocket cvs svn git

grep -i git/GIT/GiT grep

git git git git

git-gui Tk git GUI git

gitk Tcl/Tk GUI git git

[root@wupengchong ~]# yum install git-all.i386

SVN Git Git

git google git http://git.or.cz/ git

gittutorial(7) Everyday Git

[root@wupengchong ~]# git config global user.name rocrocket

git init shell .git

[root@wupengchong rocrocket]# cat -n main.c

[root@wupengchong rocrocket]# git diff cached

git diff cached index file working tree

[root@wupengchong rocrocket]# git status

# Changed but not updated:

changed but not updated git git add

[root@wupengchong rocrocket]# git add main.c

git main.c git

[root@wupengchong rocrocket]# git commit

[root@wupengchong rocrocket]# git log

git log Version0.02 git commit

git add git diff git status git commit

[root@wupengchong rocrocket]# git branch

git branch git

[root@wupengchong rocrocket]# ./a.out

[root@wupengchong rocrocket]# git commit -a

[root@wupengchong rocrocket]# git checkout master

log status experimental

[root@wupengchong rocrocket]# git merge experimental

[root@wupengchong rocrocket]# git commit -a

[root@wupengchong rocrocket]# gitk

xiaoqiang$ git clone /home/rocrocket/git-study/rocrocket myrepo

// git add .; git commit;

#git diff // git add add

#git commit -a // experimental commit

#git commit -a // master

#git checkout master

bob$git commit -a //bob git rocrocket

merge master git branch -D

bob clone myrepo

[rocrocket@wupengchong project]$ git show 5b888402aadd3cd41b3fe8c84a8658da07893b20

[rocrocket@wupengchong project]$ git show 5b888 //

[rocrocket@wupengchong project]$git show master

[rocrocket@wupengchong project]$git show HEAD

commit parent commit^ parent

[rocrocket@wupengchong project]$git show HEAD^ // HEAD

[rocrocket@wupengchong project]$git show HEAD^1 // HEAD

[rocrocket@wupengchong project]$ git tag V3 5b888 // V3 (5b888)

[rocrocket@wupengchong project]$ git log V3..V7 // V3 V7

[rocrocket@wupengchong project]$ git log experimental..stable // stable experimental

[rocrocket@wupengchong project]$ gitk since=2 weeks ago drivers/ // GUI 2

[rocrocket@wupengchong test-project]$ git cat-file -t 241e //cat-file -t ID

9a327 file.txt ID 7d4e0f

HEAD master HEAD

HEAD commit parent commit

commit tree tree parentcommit

commit git diff

[rocrocket@wupengchong test-project]$ git diff

git add git diff diff

add git diff commit git diff HEAD

[rocrocket@wupengchong test-project]$ git diff HEAD

git diff HEAD