Browse Source

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

i.e. don't merge things when they don't have to be merged.
Lucas Stadler 11 years ago
parent
commit
fd7df02ace
1 changed files with 2 additions and 0 deletions
  1. 2 0
      .gitconfig

+ 2 - 0
.gitconfig

30
	insteadOf = p0n:
30
	insteadOf = p0n:
31
[push]
31
[push]
32
	default = simple
32
	default = simple
33
[pull]
34
	ff = only