hauleth, 4 months ago

@b0rk not exactly git-config option, but .config/git/attributes with *.lock merge=binary is a blessing for conflicts in merge files. Also commit.cleanup=scissors is handy when you want to use # in your commit message