search

huixisheng / huixisheng.github.com

前端开发者说，记录前端的故事
http://huixisheng.github.io/
12 stars 3 forks source link

git merge rebase cherry-pack fast-forward #43

Open huixisheng opened 5 years ago

huixisheng commented 5 years ago

git merge --help >> git-merge man git merge查看相关的帮助文档 --ff fast-forward 快进模式

cherry-pick "复制"一个任何分支提交节点并在当前分支做一次完全一样的新提交

huixisheng commented 5 years ago
huixisheng commented 5 years ago

git config --global branch.autosetuprebase always

[branch "master"]
  remote = origin
  merge = refs/heads/master
  rebase = true