git测试笔记

root@rdcdz10851:~/gittest# cd a
root@rdcdz10851:~/gittest/a# git branch
* master
root@rdcdz10851:~/gittest/a# git log --pretty=oneline
90866f2f91c211080d2e0e773f1d0a3d14e6f763 a v1.0
root@rdcdz10851:~/gittest/a# cd ..
#用a仓库克隆一个纯仓库server.git
root@rdcdz10851:~/gittest# git clone --bare a server.git
Initialized empty Git repository in /root/gittest/server.git/
#将纯仓库sever.git复制到远程服务器上，只是纯仓库，里面没有工作目录
root@rdcdz10851:~/gittest# scp -r server.git root@192.168.16.22:~/gittest/server/
packed-refs 100% 85 0.1KB/s 00:00
config 100% 66 0.1KB/s 00:00
description 100% 73 0.1KB/s 00:00
pre-rebase.sample 100% 4942 4.8KB/s 00:00
post-update.sample 100% 189 0.2KB/s 00:00
applypatch-msg.sample 100% 452 0.4KB/s 00:00
prepare-commit-msg.sample 100% 1219 1.2KB/s 00:00
pre-commit.sample 100% 1576 1.5KB/s 00:00
post-commit.sample 100% 160 0.2KB/s 00:00
commit-msg.sample 100% 894 0.9KB/s 00:00
pre-applypatch.sample 100% 398 0.4KB/s 00:00
post-receive.sample 100% 552 0.5KB/s 00:00
update.sample 100% 3609 3.5KB/s 00:00
exclude 100% 240 0.2KB/s 00:00
HEAD 100% 23 0.0KB/s 00:00
9bb4c89832e4dcdde2c7549369453b7781cdc7 100% 50 0.1KB/s 00:00
866f2f91c211080d2e0e773f1d0a3d14e6f763 100% 128 0.1KB/s 00:00
2c81836a71d7f735e5a7a1dc214454dc7a6b4c
#克隆一个远程服务器上的仓库到本地 100% 26 0.0KB/s 00:00
root@rdcdz10851:~/gittest# git clone root@192.168.16.22:~/gittest/server/server.git b
Initialized empty Git repository in /root/gittest/b/.git/
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (3/3), done.
root@rdcdz10851:~/gittest# rm -rf server.git
root@rdcdz10851:~/gittest# cd b
root@rdcdz10851:~/gittest/b# git remote -v
origin root@192.168.16.22:~/gittest/server/server.git (fetch)
origin root@192.168.16.22:~/gittest/server/server.git (push)

#a fetch下来数据后，并没有合并，要手动合并到当前分支上
root@rdcdz10851:~/gittest/a# git fetch #fetch数据
root@rdcdz10851:~/gittest/a# git merge origin/master #将远程分支合并到当前分支上
#上面两步可以用git pull代替

#用git fetch取出数据后可以在取出的远程分支上创建一个新的分支来跟踪远程分支
root@rdcdz10851:~/gittest/b# git fetch
root@rdcdz10851:~/gittest/b# git checkout -b master2 origin/origin-master2

#如果不是在master分支上,pull数据和push数据时一定要指明仓库名称和分支
root@rdcdz10851:~/gittest/a# git push origin master2:origin-master2 #a 将master2分支push到远程的origin-master2分支
root@rdcdz10851:~/gittest/b# git pull origin origin-master2 #b从远程的origin-master2分支pull数据


资料网址：[url]http://progit.org/book/zh/[/url]