config: add core.mode = progress pseudo-config

  merge.defaulttoupstream = true
  branch.autosetupmerge = always
  mergetool.prompt = false

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>