dotfiles/.gitconfig at master · jayfreestone/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
[core]
    excludesfile = ~/.gitignore_global
    pager = delta
	autocrlf = input
[interactive]
    diffFilter = delta --color-only
[delta]
    navigate = true  # use n and N to move between diff sections
    file-modified-label = delta
[color]
    ui = auto
[rerere]
    enabled = true
[rebase]
    autosquash = true
    # https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/
    updateRefs = true
[fetch]
    prune = true
[push]
    autoSetupRemote = true
[pull]
    ff = only
[merge]
#    ff = only
	tool = Kaleidoscope
    conflictstyle = diff3
[include]
    path = ~/.gitconfig.local
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustExitCode = true
[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
	prompt = false
[mergetool]
	prompt = false
[diff]
	tool = Kaleidoscope
[url "ssh://git@github.com/"]
  insteadOf = https://github.com/
[alias]
	recent = branch --sort=-committerdate --format=\"%(committerdate:relative)%09%(refname:short)\"
	pr-with-commit = !~/dotfiles/zsh/scripts/hub-pr-with-commit.sh
	diff-patch = !~/dotfiles/zsh/scripts/diff-patch.sh