浏览代码

~/.gitconfig: use `--ff-only` for pulls automatically

i.e. don't merge things when they don't have to be merged.
Lucas Stadler 11 年之前
父节点
当前提交
fd7df02ace
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      .gitconfig

+ 2 - 0
.gitconfig

@ -30,3 +30,5 @@
30 30
	insteadOf = p0n:
31 31
[push]
32 32
	default = simple
33
[pull]
34
	ff = only