diff options
Diffstat (limited to 'git')
| -rw-r--r-- | git/config | 75 |
1 files changed, 48 insertions, 27 deletions
@@ -10,12 +10,19 @@ [http] sslVerify = false +[column] + ui = auto + [commit] gpgsign = true verbose = true [branch] autosetuprebase = always + sort = -committerdate + +[tag] + sort = version:refname [help] autocorrect = 1 @@ -38,6 +45,8 @@ [rebase] autoStash = true + autoSquash = true + updateRefs = true [pull] rebase = true @@ -46,41 +55,23 @@ [fetch] prune = true pruneTags = true + all = true output = full +[push] + default = simple + autoSetupRemote = true + followTags = true + +[merge] + conflictstyle = zdiff3 + [core] preloadindex = true excludesFile = ~/.gitignore trustctime = false commitGraph = true -[color] - ui = auto - -[color "diff"] - meta = yellow bold - commit = green bold - frag = magenta bold - old = red bold - new = green bold - whitespace = red reverse - -[color "diff-highlight"] - oldNormal = red bold - oldHighlight = red bold 52 - newNormal = green bold - newHighlight = green bold 22 - -[color "branch"] - current = yellow reverse - local = yellow - remote = green - -[color "status"] - added = yellow - changed = green - untracked = cyan - [diff] indentHeuristic = true algorithm = histogram @@ -91,6 +82,7 @@ [rerere] enabled = true + autoupdate = true [pager] color = true @@ -128,5 +120,34 @@ [include] path = .gitconfig.local + [gpg] format = ssh + +[color] + ui = auto + +[color "diff"] + meta = yellow bold + commit = green bold + frag = magenta bold + old = red bold + new = green bold + whitespace = red reverse + +[color "diff-highlight"] + oldNormal = red bold + oldHighlight = red bold 52 + newNormal = green bold + newHighlight = green bold 22 + +[color "branch"] + current = yellow reverse + local = yellow + remote = green + +[color "status"] + added = yellow + changed = green + untracked = cyan + |