Skip to content

Commit

Permalink
Git pull --rebase 说明
Browse files Browse the repository at this point in the history
  • Loading branch information
xirong committed Jun 12, 2015
1 parent cd1d0f7 commit 8015160
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
- [git flow 中文备忘清单](http://danielkummer.github.io/git-flow-cheatsheet/index.zh_CN.html)
- 一个很有意思的学习 git 的小游戏 http://pcottle.github.io/learnGitBranching/

# 备忘最佳实践
- merge分支用 --no-ff
- git pull使用 -rebase
# 最佳实践备案
- merge 分支用 --no-ff
- 恰当的使用 `git pull --rebase` 避免不必要的merge记录。 详情 http://stackoverflow.com/questions/2472254/when-should-i-use-git-pull-rebase

0 comments on commit 8015160

Please sign in to comment.