标签：简单 rate fft rust str www 过程 vim lob
将master分支合并到feature分支最简单的办法就是用下面这些命令：
git checkout feature
git merge master
或者，你也可以把它们压缩在一行里。
git merge master feature作为merge的替代选择，你可以像下面这样将feature分支并入master分支：
git checkout feature
git rebase master
它会把整个feature分支移动到master分支的后面，有效地把所有master分支上新的提交并入过来。但是，rebase为原分支上每一个提交创建一个新的提交，重写了项目历史，并且不会带来合并提交。
.gitconfig[user]
name = 倪建峰
email = nijianfeng@cai-inc.com
[core]
excludesfile = /Users/nijianfeng/.gitignore_global
editor = /usr/bin/vim
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[alias]
co = checkout
br = branch -avv
ci = commit
st = status
l = log --oneline --decorate -12
lg = log --color --graph --pretty=format:‘%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset‘ --abbrev-commit --
rl = reflog --pretty=format:‘%Cred%h%Creset %Cgreen(%cr)%Creset %gs %C(bold blue)<%an>%Creset %s -%C(yellow)%d%Creset‘
[diff]
tool = bc3
[difftool]
bc3 = trustExitCode
[merge]
tool = bc3
[mergetool]
bc3 = trustExitCode
标签：简单 rate fft rust str www 过程 vim lob
原文地址：http://www.cnblogs.com/wade-luffy/p/6103939.html
