dotfiles/.gitconfig.base at main · mshick/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
82
83
84
85
86
87
88
89
# Base git configuration - shared across machines
# User-specific settings (name, email) are set via `just setup-git`

[init]
    defaultBranch = main

[core]
    excludesfile = ~/.gitignore_global
    editor = nvim
    pager = delta

[interactive]
    diffFilter = delta --color-only

[delta]
    navigate = true      # use n/N to jump between diff sections
    side-by-side = true  # side-by-side view
    line-numbers = true

[pull]
    rebase = true

[rerere]
    enabled = true       # remember conflict resolutions

[branch]
    sort = -committerdate  # show recent branches first

[column]
    ui = auto            # nicer column formatting

[push]
    default = current
    autoSetupRemote = true

[fetch]
    prune = true

[rebase]
    autoStash = true

[merge]
    conflictstyle = diff3

[diff]
    colorMoved = default

[color]
    ui = true

[alias]
    # Status
    s = status -sb

    # Logging
    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
    ll = log --oneline
    last = log -1 HEAD --stat

    # Branches
    co = checkout
    cob = checkout -b
    br = branch
    bra = branch -a

    # Commits
    cm = commit -m
    ca = commit --amend
    can = commit --amend --no-edit

    # Diff
    d = diff
    dc = diff --cached

    # Undo
    undo = reset HEAD~1 --mixed
    unstage = reset HEAD --

    # Stash
    sl = stash list
    sp = stash pop
    ss = stash save

    # Clean
    cleanup = "!git branch --merged | grep -v '\\*\\|main\\|master' | xargs -n 1 git branch -d"

[include]
    # Local/private config (not in dotfiles repo)
    path = ~/.gitconfig.local