[关闭]
@22221cjp 2016-08-17T15:26:59.000000Z 字数 14162 阅读 1526

Git记录

工作

默认git clone是clone的 master分支

如果要clone指定分支：

git checkout --track -b [local-branch-name] origin/[origin-branch-name]

git push origin HEAD:chenjp

git commit -a -m ‘test2'

一次冲突解决过程

  1. cd /Users/chenjp/Documents/dianping/biz/\.idea/artifacts
  3. Last login: Thu May  7 16:17:30 on ttys001
  5. chenjp@chenjpdeMacBook-Pro ~$ cd /Users/chenjp/Documents/dianping/biz/\.idea/artifacts
  7. chenjp@chenjpdeMacBook-Pro artifacts$ pwd
  9. /Users/chenjp/Documents/dianping/biz/.idea/artifacts
  11. chenjp@chenjpdeMacBook-Pro artifacts$ cd ..
  13. chenjp@chenjpdeMacBook-Pro .idea$ cd ..
  15. chenjp@chenjpdeMacBook-Pro biz$ ls
  17. README.md          beauty-biz-impl    biz-parent.iml     target
  19. beauty-biz-api     beauty-biz-service pom.xml
  21. chenjp@chenjpdeMacBook-Pro biz$ ls -a
  23. .                  .gitignore         beauty-biz-api     biz-parent.iml
  25. ..                 .idea              beauty-biz-impl    pom.xml
  27. .git               README.md          beauty-biz-service target
  29. chenjp@chenjpdeMacBook-Pro biz$ cat .gitignore 
  31. /.settings
  33. /target
  35. /test-output
  37. /.classpath
  39. /.project
  41. *.iml
  43. **.DS_Store
  45. chenjp@chenjpdeMacBook-Pro biz$ echo "/.idea" >> .gitignore 
  47. chenjp@chenjpdeMacBook-Pro biz$ cat .gitignore 
  49. /.settings
  51. /target
  53. /test-output
  55. /.classpath
  57. /.project
  59. *.iml
  61. **.DS_Store
  63. /.idea
  65. chenjp@chenjpdeMacBook-Pro biz$ pqs
  67. -bash: pqs: command not found
  69. chenjp@chenjpdeMacBook-Pro biz$ pwd
  71. /Users/chenjp/Documents/dianping/biz
  73. chenjp@chenjpdeMacBook-Pro biz$ 
  75. chenjp@chenjpdeMacBook-Pro biz$ 
  77. chenjp@chenjpdeMacBook-Pro biz$ ls
  79. README.md          beauty-biz-impl    biz-parent.iml     target
  81. beauty-biz-api     beauty-biz-service pom.xml
  83. chenjp@chenjpdeMacBook-Pro biz$ cd ..
  85. chenjp@chenjpdeMacBook-Pro dianping$ ls
  87. biz                   promotion-biz-server  technician-mobile-web
  89. data                  promotion-mobile-web
  91. iml                   technician-biz
  93. chenjp@chenjpdeMacBook-Pro dianping$ cd technician-biz/
  95. chenjp@chenjpdeMacBook-Pro technician-biz$ ls
  97. README.md                 technician-biz-api        technician-biz-service
  99. pom.xml                   technician-biz-impl
  101. target                    technician-biz-parent.iml
  103. chenjp@chenjpdeMacBook-Pro technician-biz$ git branch
  105. * master
  107. chenjp@chenjpdeMacBook-Pro technician-biz$ pwd
  109. /Users/chenjp/Documents/dianping/technician-biz
  111. chenjp@chenjpdeMacBook-Pro technician-biz$ 
  113. chenjp@chenjpdeMacBook-Pro technician-biz$ cd ..
  115. chenjp@chenjpdeMacBook-Pro dianping$ ls
  117. biz                   promotion-biz-server  technician-mobile-web
  119. data                  promotion-mobile-web
  121. iml                   technician-biz
  123. chenjp@chenjpdeMacBook-Pro dianping$ mkdir technician-biz-master
  125. chenjp@chenjpdeMacBook-Pro dianping$ cd technician-biz-master/
  127. chenjp@chenjpdeMacBook-Pro technician-biz-master$ ls
  129. chenjp@chenjpdeMacBook-Pro technician-biz-master$ pwd
  131. /Users/chenjp/Documents/dianping/technician-biz-master
  135. //这里突然有的，是因为用工具生成clone了
  137. chenjp@chenjpdeMacBook-Pro technician-biz-master$ ls
  139. README.md              technician-biz-api     technician-biz-service
  141. pom.xml                technician-biz-impl
  143. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git branch
  145. * master
  147. chenjp@chenjpdeMacBook-Pro technician-biz-master$ 
  149. chenjp@chenjpdeMacBook-Pro technician-biz-master$ 
  151. chenjp@chenjpdeMacBook-Pro technician-biz-master$ ls
  153. README.md              technician-biz-api     technician-biz-service
  155. pom.xml                technician-biz-impl
  157. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git branch
  159. * master
  161. chenjp@chenjpdeMacBook-Pro technician-biz-master$ pwd
  163. /Users/chenjp/Documents/dianping/technician-biz-master
  165. chenjp@chenjpdeMacBook-Pro technician-biz-master$ 
  167. chenjp@chenjpdeMacBook-Pro technician-biz-master$ 
  169. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git branch -a
  171. * master
  173.   remotes/origin/HEAD -> origin/master
  175.   remotes/origin/chenjp
  177.   remotes/origin/hao.yuan
  179.   remotes/origin/lightmerge
  181.   remotes/origin/master
  183. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git checkout --track -b chenjp  origin/chenjp
  185. Branch chenjp set up to track remote branch chenjp from origin.
  187. Switched to a new branch 'chenjp'
  189. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git branch
  191. * chenjp
  193.   master
  195. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git checkout master
  197. Switched to branch 'master'
  199. Your branch is up-to-date with 'origin/master'.
  201. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git pull
  203. Already up-to-date.
  205. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git checkout chenjp
  207. Switched to branch 'chenjp'
  209. Your branch is up-to-date with 'origin/chenjp'.
  211. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git branch
  213. * chenjp
  215.   master
  217. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git rebase master
  219. First, rewinding head to replay your work on top of it...
  221. Applying: 丽人周报提交
  223. Using index info to reconstruct a base tree...
  225. M technician-biz-service/src/main/resources/config/spring/local/applicationContext-pigeon.xml
  227. <stdin>:3362: trailing whitespace.
  229.      * 根据传入的时间获得当前时间所在周的第一天和第七天日期 
  231. <stdin>:3363: trailing whitespace.
  233.      * @param tm 时间 
  235. <stdin>:3364: trailing whitespace.
  237.      * @param firstday 周日作为周一为0，周一作为周一1。 
  239. <stdin>:3513: trailing whitespace.
  241.     Id, TechnicianId, Name, ShopId, CityId, CategoryId, Star, TotalStar, PopularityRankChange, 
  243. <stdin>:3514: trailing whitespace.
  245.     StarRank, StarRankChange, TotalTechnician, BookOrderCount, WeeklyVisits, IsDeleted, 
  247. warning: squelched 18 whitespace errors
  249. warning: 23 lines add whitespace errors.
  251. Falling back to patching base and 3-way merge...
  253. Auto-merging technician-biz-service/src/main/resources/config/spring/local/applicationContext-pigeon.xml
  255. CONFLICT (content): Merge conflict in technician-biz-service/src/main/resources/config/spring/local/applicationContext-pigeon.xml
  257. Failed to merge in the changes.
  259. Patch failed at 0001 丽人周报提交
  261. The copy of the patch that failed is found in:
  263.    /Users/chenjp/Documents/dianping/technician-biz-master/.git/rebase-apply/patch
  267. When you have resolved this problem, run "git rebase --continue".
  269. If you prefer to skip this patch, run "git rebase --skip" instead.
  271. To check out the original branch and stop rebasing, run "git rebase --abort".
  275. chenjp@chenjpdeMacBook-Pro technician-biz-master$ ls
  277. README.md              technician-biz-api     technician-biz-service
  279. pom.xml                technician-biz-impl
  281. chenjp@chenjpdeMacBook-Pro technician-biz-master$ git branch
  283. * (no branch, rebasing chenjp)
  285.   chenjp
  287.   master
  289. chenjp@chenjpdeMacBook-Pro technician-biz-master$ cd technician-biz-service/
  291. chenjp@chenjpdeMacBook-Pro technician-biz-service$ ls
  293. pom.xml src
  295. chenjp@chenjpdeMacBook-Pro technician-biz-service$ cd src/main/
  297. chenjp@chenjpdeMacBook-Pro main$ ls
  299. java      resources webapp
  301. chenjp@chenjpdeMacBook-Pro main$ cd resources/
  303. chenjp@chenjpdeMacBook-Pro resources$ ls
  305. META-INF    config      log4j.xml   logback.xml
  307. chenjp@chenjpdeMacBook-Pro resources$ cd config/
  309. chenjp@chenjpdeMacBook-Pro config$ ls
  311. applicationContext.properties spring
  313. chenjp@chenjpdeMacBook-Pro config$ cd spring/
  315. chenjp@chenjpdeMacBook-Pro spring$ ls
  317. local
  319. chenjp@chenjpdeMacBook-Pro spring$ cd local/
  321. chenjp@chenjpdeMacBook-Pro local$ ls
  323. applicationContext-client.xml
  325. applicationContext-core.xml
  327. applicationContext-pigeon.xml
  329. applicationContext-swallow-technicianReview.xml
  331. chenjp@chenjpdeMacBook-Pro local$ ls -a
  333. .
  335. ..
  337. applicationContext-client.xml
  339. applicationContext-core.xml
  341. applicationContext-pigeon.xml
  343. applicationContext-swallow-technicianReview.xml
  345. chenjp@chenjpdeMacBook-Pro local$ vim applicationContext-pigeon.xml 
  347. chenjp@chenjpdeMacBook-Pro local$ cd ..
  349. chenjp@chenjpdeMacBook-Pro spring$ ls
  351. local
  353. chenjp@chenjpdeMacBook-Pro spring$ cd ..
  355. chenjp@chenjpdeMacBook-Pro config$ cd ..
  357. chenjp@chenjpdeMacBook-Pro resources$ ls
  359. META-INF    config      log4j.xml   logback.xml
  361. chenjp@chenjpdeMacBook-Pro resources$ cd ..
  363. chenjp@chenjpdeMacBook-Pro main$ cd ..
  365. chenjp@chenjpdeMacBook-Pro src$ cd ..
  367. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git branch
  369. * (no branch, rebasing chenjp)
  371.   chenjp
  373.   master
  375. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git add .
  377. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git rebase --continue
  379. Applying: 丽人周报提交
  381. Applying: update 技师周报
  383. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git status
  385. On branch chenjp
  387. Your branch and 'origin/chenjp' have diverged,
  389. and have 8 and 2 different commits each, respectively.
  391.   (use "git pull" to merge the remote branch into yours)
  393. nothing to commit, working directory clean
  395. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git rebase master
  397. Current branch chenjp is up to date.
  399. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git branch 
  401. * chenjp
  403.   master
  405. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git push origin HEAD:chenjp
  407. To git@code.dianpingoa.com:technician/technician-biz.git
  409.  ! [rejected]        HEAD -> chenjp (non-fast-forward)
  411. error: failed to push some refs to 'git@code.dianpingoa.com:technician/technician-biz.git'
  413. hint: Updates were rejected because the tip of your current branch is behind
  415. hint: its remote counterpart. Integrate the remote changes (e.g.
  417. hint: 'git pull ...') before pushing again.
  419. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  421. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git branch
  423. * chenjp
  425.   master
  427. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git status
  429. On branch chenjp
  431. Your branch and 'origin/chenjp' have diverged,
  433. and have 8 and 2 different commits each, respectively.
  435.   (use "git pull" to merge the remote branch into yours)
  437. You have unmerged paths.
  439.   (fix conflicts and run "git commit")
  443. Unmerged paths:
  445.   (use "git add <file>..." to mark resolution)
  449. both modified:   src/main/resources/config/spring/local/applicationContext-pigeon.xml
  453. no changes added to commit (use "git add" and/or "git commit -a")
  455. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git add .
  457. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git status
  459. On branch chenjp
  461. Your branch and 'origin/chenjp' have diverged,
  463. and have 8 and 2 different commits each, respectively.
  465.   (use "git pull" to merge the remote branch into yours)
  467. All conflicts fixed but you are still merging.
  469.   (use "git commit" to conclude merge)
  473. Changes to be committed:
  477. modified:   src/main/resources/config/spring/local/applicationContext-pigeon.xml
  481. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git commit -a -m 'resolve conflict'
  483. [chenjp 45eab62] resolve conflict
  485. chenjp@chenjpdeMacBook-Pro technician-biz-service$ 
  487. chenjp@chenjpdeMacBook-Pro technician-biz-service$ 
  489. chenjp@chenjpdeMacBook-Pro technician-biz-service$ 
  491. chenjp@chenjpdeMacBook-Pro technician-biz-service$ 
  493. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git log
  495. commit 45eab62cef9cc116403f65aa3b1f008f394a1259
  497. Merge: 160f108 41ec8e0
  499. Author: jinpeng.chen <22221cjp@163.com>
  501. Date:   Fri May 8 18:35:26 2015 +0800
  505.     resolve conflict
  509. commit 160f1081dc209010ab4c894cb8c8c7ffc4c6541f
  511. Author: jinpeng.chen <22221cjp@163.com>
  513. Date:   Fri May 8 17:16:41 2015 +0800
  517.     update 技师周报
  521. commit 0c88ed90d6c2ede39dc77ce8be1b8caaeb34fe39
  523. Author: jinpeng.chen <22221cjp@163.com>
  525. Date:   Thu May 7 19:31:12 2015 +0800
  529.     丽人周报提交
  533. commit 41ec8e0b88c74792639458ad3ecb37ba608ba6e4
  535. Author: jinpeng.chen <22221cjp@163.com>
  537. Date:   Fri May 8 17:16:41 2015 +0800
  541. chenjp@chenjpdeMacBook-Pro technician-biz-service$ git push origin HEAD:chenjp
  543. Counting objects: 30, done.
  545. Delta compression using up to 4 threads.
  547. Compressing objects: 100% (27/27), done.
  549. Writing objects: 100% (30/30), 2.49 KiB | 0 bytes/s, done.
  551. Total 30 (delta 15), reused 0 (delta 0)
  553. To git@code.dianpingoa.com:technician/technician-biz.git
  555.    41ec8e0..45eab62  HEAD -> chenjp
  557. chenjp@chenjpdeMacBook-Pro technician-biz-service$

合并不同分支查看这个链接：
http://www.cnblogs.com/kym/archive/2010/08/12/1797937.html

Git如何进行分支管理？

1、创建分支

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

2、切换分支

git checkout <分支名>
该语句和上一个语句可以和起来用一个语句表示：git checkout -b <分支名>

3、分支合并

比如，如果要将开发中的分支（develop），合并到稳定分支（master），
首先切换的master分支：git checkout master。
然后执行合并操作：git merge develop。
如果有冲突，会提示你，调用git status查看冲突文件。
解决冲突，然后调用git add或git rm将解决后的文件暂存。
所有冲突解决后，git commit 提交更改。

4、分支衍合

分支衍合和分支合并的差别在于，分支衍合不会保留合并的日志，不留痕迹，而 分支合并则会保留合并的日志。
要将开发中的分支（develop），衍合到稳定分支（master）。
首先切换的master分支：git checkout master。
然后执行衍和操作：git rebase develop。
如果有冲突，会提示你，调用git status查看冲突文件。
解决冲突，然后调用git add或git rm将解决后的文件暂存。
所有冲突解决后，git rebase --continue 提交更改。

5、删除分支

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

=============================

建立本地的dev分支追踪远程仓库的develop分支

git checkout –b dev origin/develop
git push origin HEAD:chenjp

==============================

orgin在git中到底啥意思？

origin 是远程仓库在本地的别名。因为每次输入一次远程仓库的url比较麻烦，所以就起个一个别名。如果新的仓库是在远程建立的，如oschina上，然后通过clone下来的。如果在clone下来的本地仓库中输入git remote -v可以查看

可以看到默认的别名就是origin，这个名字也好理解。因为origin本意是“原始的”，远程相对于本地的clone版本，的确是原始的。
但是如果仓库是在本地通过git init 建立的。这时候就没有一个远程仓库和本地对应。这时候就需要执行如下这个命令了。

git remote add origin git@xbc.me:wordpress.git

约定俗成，这里的别名依然叫origin。

但是现在一般都是在远程先建立，然后直接clone到本地。这样更省事。

git stash save '说一点这次stash保存内容'
git stash list
git stash pop stash{0} 弹出stash栈中的某一次临时保存

===================================================================

在本地新建立仓库，然后和远程仓库对应上

git init
git add .
git commit -am ‘first commit'

git remote add origin https://xxxxxxx
git remote -v
git remote rm origin //删除origin别名对应的远程仓库
ssh-keygen -t rsa -C 'you_email@email.com'
复制~/.ssh /rsa.pub 到github上配置一下
git pull —rebase origin master

git checkout -b new_branch
git checkout -b new_branch origin/branch1 //基于远程仓库的branch1创建本地分支new_branch
git stash 将本地工作临时保存
git stash save ‘descripe your work’
git stash list
git stash pop stash@{0}
git stash clear

git push origin HEAD:chenjp
git rebase master //将master合并到当前分支，保留master的提交记录

git branch 查看分支
git branch -D branch1

//基于某次提交创建分支----间接回到历史上某个版本
git branch branch_name fe873ac91

git push origin :branch-name //删除远程仓库分支
git branch -m old_branch new_branch //重命名分支
git cherry-pick [commit_bash] //将一个次提交应用到当前分支

//有时候rebase了其他分支，改变了当前分支之前的历史，push的时候会出错，这时候需要添加--force参数
git push —force origin HEAD:chenjp
git rm —cached filename //取消某个文件的跟踪
git rm —cached -r dir //取消某个目录的跟踪

git pull命令的作用是，取回远程主机某个分支的更新，再与本地的指定分支合并。它的完整格式稍稍有点复杂。

$ git pull <远程主机名> <远程分支名>:<本地分支名>
比如，取回origin主机的next分支，与本地的master分支合并，需要写成下面这样。

$ git pull origin next:master
如果远程分支是与当前分支合并，则冒号后面的部分可以省略。

$ git pull origin next

实际使用最好用git pull --rebase保留合并的历史

故障处理

==========================git 故障处理========================
基于远程分支创建本地分支的时候，有时候会报这个错。

  1. chenjp@chenjp ~/D/d/beauty-merchant-biz> git checkout -b dengyun.zhou origin/dengyun.zhou
  2. fatal: Cannot update paths and switch to branch 'dengyun.zhou' at the same time.
  3. Did you intend to checkout 'origin/dengyun.zhou' which can not be resolved as commit?
  4. chenjp@chenjp ~/D/d/beauty-merchant-biz>

原因是自己原来clone的时候，远程并没有这个分支，通过如下命令查看

  1. chenjp@chenjp ~/D/d/beauty-merchant-biz> git branch -a
  2. * chenjp
  3.   master
  4.   remotes/origin/20150810-offline
  5.   remotes/origin/20151010-authority
  6.   remotes/origin/HEAD -> origin/master
  7.   remotes/origin/lightmerge
  8.   remotes/origin/master
  9. chenjp@chenjp ~/D/d/beauty-merchant-biz>

所以会报上面的错。解决方法，需要fetch下所有的远程分支。

  1. chenjp@chenjp ~/D/d/beauty-merchant-biz> git fetch origin
  2. remote: Counting objects: 892, done.
  3. remote: Compressing objects: 100% (486/486), done.
  4. remote: Total 892 (delta 364), reused 175 (delta 71)
  5. Receiving objects: 100% (892/892), 79.89 KiB | 0 bytes/s, done.
  6. Resolving deltas: 100% (364/364), completed with 21 local objects.
  7. From code.dianpingoa.com:beauty/beauty-merchant-biz
  8.    d2b3d6b..ab0979c  20151010-authority -> origin/20151010-authority
  9.  * [new branch]      dengyun.zhou -> origin/dengyun.zhou
  10.    d2b3d6b..84519c7  lightmerge -> origin/lightmerge
  11.  * [new branch]      shuang.he  -> origin/shuang.he
  12. chenjp@chenjp ~/D/d/beauty-merchant-biz> git branch -a
  13. * chenjp
  14.   master
  15.   remotes/origin/20150810-offline
  16.   remotes/origin/20151010-authority
  17.   remotes/origin/HEAD -> origin/master
  18.   remotes/origin/dengyun.zhou
  19.   remotes/origin/lightmerge
  20.   remotes/origin/master
  21.   remotes/origin/shuang.he
  22. chenjp@chenjp ~/D/d/beauty-merchant-biz> git checkout -b dengyun.zhou origin/dengyun.zhou
  23. Branch dengyun.zhou set up to track remote branch dengyun.zhou from origin.
  24. Switched to a new branch 'dengyun.zhou'
  25. chenjp@chenjp ~/D/d/beauty-merchant-biz>

Git忽略文件

git忽略多层文件夹是经常的需求，在.gitignore忽略多层文件夹用：**
**/bin/Debug/
前面的两个*号代表任意多层上级文件夹
需要 git 1.8.2 及其以上的版本才支持

添加新批注
在作者公开此批注前，只有你和作者可见。
回复批注