[git] Power up ignore list
[git] Remove superfluous mode declaration
[git] Don't prompt for the mergetool
[git] Don't default to upstream merges
[git] Don't do ff merges by default