Git使用

一：git分支管理

1、创建分支

创建分支很简单：git branch <分支名>

2、切换分支

git checkout <分支名>

3、创建并切换分支

git checkout -b <分支名>

4、分支合并

比如，如果要将开发中的分支（develop），合并到稳定分支（master），

首先切换的master分支：git checkout master。

然后执行合并操作：git merge develop。

如果有冲突，会提示你，调用git status查看冲突文件。

解决冲突，然后调用git add或git rm将解决后的文件暂存。

所有冲突解决后，git commit 提交更改。

5、分支衍合

分支衍合和分支合并的差别在于，分支衍合不会保留合并的日志，不留痕迹，而 分支合并则会保留合并的日志。

要将开发中的分支（develop），衍合到稳定分支（master）。

首先切换的master分支：git checkout master。

然后执行衍和操作：git rebase develop。

如果有冲突，会提示你，调用git status查看冲突文件。

解决冲突，然后调用git add或git rm将解决后的文件暂存。

所有冲突解决后，git rebase –continue 提交更改。

6、查看远程分支

git branch -a

7、查看本地分支

git branch

8、删除远程分支

git push origin –delete

9、删除本地分支

执行git branch -d <分支名>

如果该分支没有合并到主分支会报错，可以用以下命令强制删除git branch -D <分支名>

10、使用git上传代码到github

gitconfig–globaluser.name“yourname” git config –global user.email “your email”

gitinit git remote add origin git@github.com:yourName/yourRepo.git

11、 Git SSH Key 生成步骤

12、git tag 给当前分支打标签

13、GIT@OSC私有库进行SSH -T提示PERMISSION DENIED的问题(git@osc使用说明)

使用ssh -T git@oschina.net 看是否”Welcome to Git@OSC, username!”，

结果提示：Permission denied (publickey).

解决办法：增加参数 -v ，即输入ssh -T git@oschina.net命令，查看报告日志：

debug1: Reading configuration data /etc/ssh/ssh_config

debug1: Connecting to git.oschina.net [103.21.119.119] port 22.

debug1: Connection established.

debug1: key_load_public: No such file or directory

debug1: identity file /c/Users/gongwen/.ssh/id_rsa type -1

debug1: key_load_public: No such file or directory

debug1: identity file /c/Users/gongwen/.ssh/id_rsa-cert type -1

debug1: key_load_public: No such file or directory

debug1: identity file /c/Users/gongwen/.ssh/id_dsa type -1

debug1: key_load_public: No such file or directory

debug1: identity file /c/Users/gongwen/.ssh/id_dsa-cert type -1

debug1: key_load_public: No such file or directory

debug1: identity file /c/Users/gongwen/.ssh/id_ecdsa type -1

debug1: key_load_public: No such file or directory

debug1: identity file /c/Users/gongwen/.ssh/id_ecdsa-cert type -1

debug1: key_load_public: No such file or directory

debug1: identity file /c/Users/gongwen/.ssh/id_ed25519 type -1

debug1: key_load_public: No such file or directory

debug1: identity file /c/Users/gongwen/.ssh/id_ed25519-cert type -1

debug1: Enabling compatibility mode for protocol 2.0

debug1: Local version string SSH-2.0-OpenSSH_7.1

debug1: Remote protocol version 2.0, remote software version OpenSSH_6.2

debug1: match: OpenSSH_6.2 pat OpenSSH* compat 0x04000000

debug1: Authenticating to git.oschina.net:22 as ‘git’

debug1: SSH2_MSG_KEXINIT sent

debug1: SSH2_MSG_KEXINIT received

debug1: kex: server->client aes128-ctr umac-64-etm@openssh.com none

debug1: kex: client->server aes128-ctr umac-64-etm@openssh.com none

debug1: sending SSH2_MSG_KEX_ECDH_INIT

debug1: expecting SSH2_MSG_KEX_ECDH_REPLY

debug1: Server host key: ecdsa-sha2-nistp256 SHA256:FQGC9Kn/eye1W8icdBgrQp+KkGYoFgbVr17bmjey0Wc

debug1: Host ‘git.oschina.net’ is known and matches the ECDSA host key.

debug1: Found key in /c/Users/gongwen/.ssh/known_hosts:2

debug1: SSH2_MSG_NEWKEYS sent

debug1: expecting SSH2_MSG_NEWKEYS

debug1: SSH2_MSG_NEWKEYS received

debug1: Roaming not allowed by server

debug1: SSH2_MSG_SERVICE_REQUEST sent

debug1: SSH2_MSG_SERVICE_ACCEPT received

debug1: Authentications that can continue: publickey

debug1: Next authentication method: publickey

debug1: Trying private key: /c/Users/gongwen/.ssh/id_rsa

debug1: Trying private key: /c/Users/gongwen/.ssh/id_dsa

debug1: Trying private key: /c/Users/gongwen/.ssh/id_ecdsa

debug1: Trying private key: /c/Users/gongwen/.ssh/id_ed25519

debug1: No more authentication methods to try.

Permission denied (publickey).

结合第四、五行提示，发现无法找到id_rsa文件(C:\Users\username.ssh目录下)，将github_rsa文件名改为id_rsa即可