Standard git config options

Tips:

Use --global to set options globally (for all repos) for the current user.
Use --system (via sudo or su) to set options for all users.

TL;DR

git config --global core.editor "nano"
git config --global pull.ff "only"
git config --global merge.ff "only"
git config --global core.filemode false

Location of config files

For Windows, the global settings are saved in $env:USERPROFILE\.gitconfig.

Example:

[core]
	editor = nano
	filemode = false

Commit editor

git config --global core.editor "nano"

Merging/Pulling

git config pull.ff "only"
git config merge.ff "only"

This new default setting can be overridden with the --no-ff option for both commands.

Permission changes

Tell git to ignore the executable bit differences between the index and the working copy. This is enable to "enabled" or "true" by default and is a frequent source of minor problems related to script permissions.

git config core.filemode false

Display current options

local/repo: git config --local --list
global (user specific): git config --global --list
system (all users): git config --system --list
everything: git config --list

deoren/git_config.md