dotfiles/gitconfig at main · omnicolor/dotfiles · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
[alias]
    # Sign commits and merges
    ci = commit -S
    merge = merge -S

    # Be lazy
    co = checkout
    p = pull --rebase

    # Cleaner and lazy git status
    s = status -s

    # Diff last commit
    dlc = diff --cached HEAD^

    # Get rid of any work
    fahqit = reset --hard HEAD

    # Some pretty-ish logs
    le = log --oneline --decorate
    lg = log --oneline --decorate --graph
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
    ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ %cn\\ %C(magenta)%G?" --decorate

    # Count of commits by person
    who = !echo \"== Commits by Author:\\n`git shortlog -s -n`\\n\"

    # Quick way of hiding changes from git status
    hide = update-index --assume-unchanged
    unhide = update-index --no-assume-unchanged

[color]
    branch = auto
    diff = auto
    interactive = auto
    pager = true
    status = auto
    ui = true

[color "branch"]
    current = red reverse
    local = blue
    remote = green

[color "diff"]
    frag = magenta
    meta = yellow
    new = green
    old = red

[color "status"]
    added = yellow
    changed = green
    untracked = cyan

[commit]
    gpgsign = true

[core]
    editor = /usr/bin/vim
    excludesfile = ~/.gitignore
    pager = less

[init]
    defaultBranch = main

[merge]
    mergeoptions = --no-ff -S
    tool = vimdiff3

[mergetool "gvimdiff3"]
    cmd = gvim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"

[mergetool "vimdiff3"]
    cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"

[pull]
    default = current

[push]
    default = tracking