github笔记２

来源：互联网发布：北京金和网络北京编辑：程序博客网时间：2024/06/05 11:42

要关联一个远程库，使用命令git remote add origin git@server-name:path/repo-name.git；

somedargon@somedargon-K45VD ~/gitWorksapce $ git remote add origin git@github.com:SomeDargon/gitWorkspace.gitsomedargon@somedargon-K45VD ~/gitWorksapce $ git push -u origin master The authenticity of host 'github.com (192.30.252.128)' can't be established.RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48.Are you sure you want to continue connecting (yes/no)? yesWarning: Permanently added 'github.com,192.30.252.128' (RSA) to the list of known hosts.Counting objects: 22, done.Delta compression using up to 4 threads.Compressing objects: 100% (18/18), done.Writing objects: 100% (22/22), 1.81 KiB | 0 bytes/s, done.Total 22 (delta 6), reused 0 (delta 0)To git@github.com:SomeDargon/gitWorkspace.git * [new branch]      master -> masterBranch master set up to track remote branch master from origin.

关联后，使用命令git push -u origin master第一次推送master分支的所有内容；

此后，每次本地提交后，只要有必要，就可以使用命令git push origin master推送最新修改；

分布式版本系统的最大好处之一是在本地工作完全不需要考虑远程库的存在，也就是有没有联网都可以正常工作，而SVN在没有联网的时候是拒绝干活的！当有网络的时候，再把本地提交推送一下就完成了同步，真是太方便了！

要克隆一个仓库，首先必须知道仓库的地址，然后使用git clone命令克隆。

 git clone git@github.com:SomeDargon/gitskills.git

Git支持多种协议，包括https，但通过ssh支持的原生git协议速度最快。

查看分支：git branch

创建分支：git branch

切换分支：git checkout

创建+切换分支：git checkout -b

合并某分支到当前分支：git merge

删除分支：git branch -d

somedargon@somedargon-K45VD ~/gitWorksapce $ git checkout -b devA   gitskills/README.mdSwitched to a new branch 'dev'somedargon@somedargon-K45VD ~/gitWorksapce $ git branch* dev  mastersomedargon@somedargon-K45VD ~/gitWorksapce $ vim readme.txt somedargon@somedargon-K45VD ~/gitWorksapce $ git add readme.txt somedargon@somedargon-K45VD ~/gitWorksapce $ git commit -m "branch test"[dev 159991a] branch test 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 gitskills/README.mdsomedargon@somedargon-K45VD ~/gitWorksapce $ git checkout masterSwitched to branch 'master'Your branch is ahead of 'origin/master' by 1 commit.  (use "git push" to publish your local commits)somedargon@somedargon-K45VD ~/gitWorksapce $ cat readme.txt Git Is a distributed version control system.Git Is free software distributed under the GPL.Git has a mutable index called stage.Git tracks changs of files.Creating a new branch is quick.somedargon@somedargon-K45VD ~/gitWorksapce $ git merge devUpdating ba2b505..159991aFast-forward gitskills/README.md | 1 + readme.txt          | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 gitskills/README.mdsomedargon@somedargon-K45VD ~/gitWorksapce $ cat readme.txt Git Is a distributed version control system.Git Is free software distributed under the GPL.Git has a mutable index called stage.Git tracks changs of files.Creating a new branch is quick.aaaaaaaaaaaaaaasomedargon@somedargon-K45VD ~/gitWorksapce $ git branch -d devDeleted branch dev (was 159991a).

当Git无法自动合并分支时，就必须首先解决冲突。解决冲突后，再提交，合并完成。

用git log –graph命令可以看到分支合并图。

git merge branchName；
git分支十分强大，在团队开发中应该充分应用。

合并分支时，加上–no-ff参数就可以用普通模式合并，合并后的历史有分支，能看出来曾经做过合并，而fast forward合并就看不出来曾经做过合并。

git merge dev --no-ff -m "merge with no-ff" devgit log --graph --pretty=oneline --abbrev-commit

0 0