dotfiles/gitconfig at master · rox163/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
[user]
        name = Roxanne Panthaky
        email = roxanne.panthaky@shopify.com
[core]
	commitGraph = true
[diff]
	algorithm = patience
[gc]
	writeCommitGraph = true
[protocol]
	version = 2
[url "https://github.com/Shopify/"]
	insteadOf = git@github.com:Shopify/
	insteadOf = git@github.com:shopify/
	insteadOf = ssh://git@github.com/Shopify/
	insteadOf = ssh://git@github.com/shopify/
[alias]
        cm = checkout main
        fo = fetch origin
        co = checkout
        ci = commit
        st = status
        br = branch
        sa = stash apply
        po = push origin
        pom = pull origin main
        rbm = rebase -i main
        rb2 = rebase -i HEAD~2
        rb3 = rebase -i HEAD~3
        ca = commit --amend
[merge]
        conflictstyle = diff3
[fetch]
        prune = true
[color "branch"]
        current = yellow reverse
        local = yellow
        remote = green
[diff]
        algorithm = patience