客户端版本：
C:\Users\xp>git --version
git version 2.14.1.windows.1
1.配置昵称
git bash执行如下命令：
（1）git config --global user.name "xiaoping"
（2）git config --global user.email "[email protected]"
通过 git config -l 这个命令查看已配置的用户名和邮箱信息
2.生成密钥对
打开git bash，输入命令一路回车。
ssh-keygen -t rsa -C "[email protected]"
二、从远端克隆工程
git bash
git clone git账户@xx.xx.xx.xx:仓库地址。
例：git clone [email protected]:data/xx.git
三、pull与push操作
开发者在本地的操作：
1.从远程仓库dev上更新代码：
git pull <远程主机> <远程分支名>:<本地分支名>
例：E:\workspace\git_test>git pull origin dev:master
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 9 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (9/9), done.
From 123.206.51.64:data/git_test
5218488..e28fd78 dev -> master
* [new branch] dev -> origin/dev
warning: fetch updated the current branch head.
fast-forwarding your working tree from
commit 521848830e57c8ae1f45cccb5fd91dd2de077c5b.
Already up-to-date.
2.本地提交代码到远程仓库dev分支上
查看状态
E:\git_workspace\demo>git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
提交步骤1：
E:\git_workspace\demo>git add .
提交步骤2：
E:\git_workspace\demo>git commit -m "提交说明信息，必须要写"
[master 34ecceb] 提交说明信息，必须要写
1 file changed, 3 insertions(+), 1 deletion(-)
提交步骤3：
git push <远程主机名> <本地分支名>:<远程分支名>
例：
E:\test\git_test>git push origin master:dev
Counting objects: 9, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (9/9), 615 bytes | 307.00 KiB/s, done.
Total 9 (delta 3), reused 0 (delta 0)
To 123.206.51.64:data/git_test.git
5218488..e28fd78 master -> dev
如果你记不住push与pull 远程分支名和本地分支名的顺序，可以设置git push和pull的默认分支:
git branch --set-upstream-to=origin/<远程分支名> <本地分支名>
例：
D:\workspace\demo>git branch --set-upstream-to=origin/dev master
Branch master set up to track remote branch dev from origin.
这样我就设置了我本地master分支push与pull的默认远程分支是dev。
二.管理员远程仓库的操作
1.创建仓库git init
这部操作完，只要一个.git的隐藏文件，这时是一空的仓库。使用git branch是看不到任何分支的
2.创建一个本地工程push到远程仓库上。
这时你会发现报错了。
remote: error: refusing to update checked out branch: refs/heads/master
remote: error: By default, updating the current branch in a non-bare repository
remote: error: is denied, because it will make the index and work tree inconsistent
remote: error: with what you pushed, and will require 'git reset --hard' to match
remote: error: the work tree to HEAD.
remote: error:
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into
remote: error: its current branch; however, this is not recommended unless you
remote: error: arranged to update its work tree to match what you pushed in some
remote: error: other way.
remote: error:
remote: error: To squelch this message and still keep the default behaviour, set
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.
To 127.0.0.1:data/git_test.git
! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to '[email protected]:data/git_test.git'
原因：这是由于git默认拒绝了push操作，需要进行设置，修改.git/config文件后面添加如下代码：
[receive]
denyCurrentBranch = ignore
操作完成功提交之后，你在远程仓库上输入 git branch你会看到一个*master。这时master分支就有了
3. 创建一个dev分支:
git branch dev(创建dev)/git checkout -b dev(创建并切换到dev)
4.远程仓库不能让开发者随意push，所以删掉2.中添加到.git/config中的内容
5.分支合并到master
[root@t2 demo.git]# pwd
/home/git/data/demo.git
[root@t2 demo.git]#
查看当前所在分支
[root@t2 demo.git]# git branch
* dev
master
[root@t2 demo.git]#
如果不在切换到master分支
[root@t2 demo.git]# git checkout master
Switched to branch 'master'
[root@t2 demo.git]# git branch
dev
* master
[root@t2 demo.git]#
将分支合并到master分支
[root@t2 demo.git]# git merge dev
Updating 1b85a27..1d471fe
Fast-forward
demo/.mvn/wrapper/maven-wrapper.jar | Bin 47610 -> 0 bytes
demo/.mvn/wrapper/maven-wrapper.properties | 1 -
demo/mvnw | 225 ---------------------
demo/mvnw.cmd | 143 -------------
.../demo/Controller/TestController.java | 15 ++
5 files changed, 15 insertions(+), 369 deletions(-)
delete mode 100644 demo/.mvn/wrapper/maven-wrapper.jar
delete mode 100644 demo/.mvn/wrapper/maven-wrapper.properties
delete mode 100644 demo/mvnw
delete mode 100644 demo/mvnw.cmd
create mode 100644 demo/src/main/java/com/Controller/TestController.java
[root@t2 demo.git]#
C:\Users\xp>git --version
git version 2.14.1.windows.1
git客户端安装自行百度吧。
一、配置昵称，用于更新版本跟踪。1.配置昵称
git bash执行如下命令：
（1）git config --global user.name "xiaoping"
（2）git config --global user.email "[email protected]"
通过 git config -l 这个命令查看已配置的用户名和邮箱信息
2.生成密钥对
打开git bash，输入命令一路回车。
ssh-keygen -t rsa -C "[email protected]"
二、从远端克隆工程
git bash
git clone git账户@xx.xx.xx.xx:仓库地址。
例：git clone [email protected]:data/xx.git
三、pull与push操作
开发者在本地的操作：
1.从远程仓库dev上更新代码：
git pull <远程主机> <远程分支名>:<本地分支名>
例：E:\workspace\git_test>git pull origin dev:master
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 9 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (9/9), done.
From 123.206.51.64:data/git_test
5218488..e28fd78 dev -> master
* [new branch] dev -> origin/dev
warning: fetch updated the current branch head.
fast-forwarding your working tree from
commit 521848830e57c8ae1f45cccb5fd91dd2de077c5b.
Already up-to-date.
2.本地提交代码到远程仓库dev分支上
查看状态
E:\git_workspace\demo>git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: demo/src/main/java/com/exception/EmsException.java
E:\git_workspace\demo>git add .
提交步骤2：
E:\git_workspace\demo>git commit -m "提交说明信息，必须要写"
[master 34ecceb] 提交说明信息，必须要写
1 file changed, 3 insertions(+), 1 deletion(-)
提交步骤3：
git push <远程主机名> <本地分支名>:<远程分支名>
例：
E:\test\git_test>git push origin master:dev
Counting objects: 9, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (9/9), 615 bytes | 307.00 KiB/s, done.
Total 9 (delta 3), reused 0 (delta 0)
To 123.206.51.64:data/git_test.git
5218488..e28fd78 master -> dev
如果你记不住push与pull 远程分支名和本地分支名的顺序，可以设置git push和pull的默认分支:
git branch --set-upstream-to=origin/<远程分支名> <本地分支名>
例：
D:\workspace\demo>git branch --set-upstream-to=origin/dev master
Branch master set up to track remote branch dev from origin.
这样我就设置了我本地master分支push与pull的默认远程分支是dev。
二.管理员远程仓库的操作
1.创建仓库git init
这部操作完，只要一个.git的隐藏文件，这时是一空的仓库。使用git branch是看不到任何分支的
2.创建一个本地工程push到远程仓库上。
这时你会发现报错了。
remote: error: refusing to update checked out branch: refs/heads/master
remote: error: By default, updating the current branch in a non-bare repository
remote: error: is denied, because it will make the index and work tree inconsistent
remote: error: with what you pushed, and will require 'git reset --hard' to match
remote: error: the work tree to HEAD.
remote: error:
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into
remote: error: its current branch; however, this is not recommended unless you
remote: error: arranged to update its work tree to match what you pushed in some
remote: error: other way.
remote: error:
remote: error: To squelch this message and still keep the default behaviour, set
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.
To 127.0.0.1:data/git_test.git
! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to '[email protected]:data/git_test.git'
原因：这是由于git默认拒绝了push操作，需要进行设置，修改.git/config文件后面添加如下代码：
[receive]
denyCurrentBranch = ignore
操作完成功提交之后，你在远程仓库上输入 git branch你会看到一个*master。这时master分支就有了
3. 创建一个dev分支:
git branch dev(创建dev)/git checkout -b dev(创建并切换到dev)
4.远程仓库不能让开发者随意push，所以删掉2.中添加到.git/config中的内容
5.分支合并到master
[root@t2 demo.git]# pwd
/home/git/data/demo.git
[root@t2 demo.git]#
查看当前所在分支
[root@t2 demo.git]# git branch
* dev
master
[root@t2 demo.git]#
如果不在切换到master分支
[root@t2 demo.git]# git checkout master
Switched to branch 'master'
[root@t2 demo.git]# git branch
dev
* master
[root@t2 demo.git]#
将分支合并到master分支
[root@t2 demo.git]# git merge dev
Updating 1b85a27..1d471fe
Fast-forward
demo/.mvn/wrapper/maven-wrapper.jar | Bin 47610 -> 0 bytes
demo/.mvn/wrapper/maven-wrapper.properties | 1 -
demo/mvnw | 225 ---------------------
demo/mvnw.cmd | 143 -------------
.../demo/Controller/TestController.java | 15 ++
5 files changed, 15 insertions(+), 369 deletions(-)
delete mode 100644 demo/.mvn/wrapper/maven-wrapper.jar
delete mode 100644 demo/.mvn/wrapper/maven-wrapper.properties
delete mode 100644 demo/mvnw
delete mode 100644 demo/mvnw.cmd
create mode 100644 demo/src/main/java/com/Controller/TestController.java
[root@t2 demo.git]#