git-configuration-and-simple-use.md

@@ -2,7 +2,7 @@ Eclipise中，import〉Project from Git ,单击next <br />
 选中Clone URI,   Next <br />
 ![1](http://tech.pingansec.com/ulindows/tech_java/uploads/aabd4da0f580270b68f975978566bd6f/1.png)     
 <br />
-输入uri,User,password <br />
+输入uri,user,password <br />
 <br />
 ![2](http://tech.pingansec.com/ulindows/tech_java/uploads/3fe4f86a6cb5705858ad53f772125304/2.png)         
 <br />
@@ -16,6 +16,7 @@ Next,
 
 ![5](http://tech.pingansec.com/ulindows/tech_java/uploads/d7ffab71ef49edddce42f8c4b08b7fc9/5.png)   
 
+![6](http://tech.pingansec.com/ulindows/tech_java/uploads/2a241e2706a019f84dc0634f309fdcd4/6.png)   
 <br />
 单击finish,项目会自动导入<br />
 <br />
@@ -26,3 +27,35 @@ UserSettings > AddEntry <br />
 添加name和email <br />
 
 ![7](http://tech.pingansec.com/ulindows/tech_java/uploads/55f8a87b1193a3ee945accc1224a48cd/7.png)   
+
+
+![8](http://tech.pingansec.com/ulindows/tech_java/uploads/6d49348a87ca34be838f20b775226486/8.png)
+<br />
+单击Apply保存 <br />
+<br />
+Window > Preferences > Team >Git >Configuration <br/>
+Repository Settings <br />
+
+![9](http://tech.pingansec.com/ulindows/tech_java/uploads/95302b7bd14a8540a4b56842c5bc460b/9.png)
+<br />
+或者直接单击location右边的 open，出现一个config文件<br />
+复制以下内容进去即可 <br />
+[core]   
+	symlinks = false   
+	repositoryformatversion = 0   
+	filemode = false   
+	logallrefupdates = true   
+[remote "origin"]   
+	url = http://tech.pingansec.com/ulindows/project_ucs.git   
+	fetch = +refs/heads/*:refs/remotes/origin/*   
+[branch "test"]   
+	remote = origin   
+	merge = refs/heads/test   
+'''注意：如果checkout出来的是master分支，则   
+[branch "master"]   
+	remote = origin   
+	merge = refs/heads/master   
+高版本的Eclipse默认会配置好 Repository Settings部分   
+<br />
+
+