-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
38 lines (36 loc) · 1.41 KB
/
.gitconfig
File metadata and controls
38 lines (36 loc) · 1.41 KB
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
[user]
email = alecf@flett.org
name = Alec Flett
signingkey = 4CD3ADEAE261DE0B3731448C9FC71993C83BEF2D
[push]
default = simple
[alias]
changed = diff --stat
pu = push -u origin HEAD
b = for-each-ref --sort=-committerdate refs/heads/
continue = "-c core.editor=true rebase --continue"
please = push --force-with-lease
commend = commit --amend --no-edit
recent = for-each-ref --sort=committerdate refs/heads/ --format=' %(color:blue) %(authorname) %(color:yellow)%(refname:short)%(color:reset)'
recent-nf = for-each-ref --sort=committerdate refs/heads/ --format=' %(authorname) %(refname:short)'
update = "!git fetch && git pull --rebase origin master"
cleanup-master = "!git checkout master && git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -d"
cleanup-main = "!git checkout main && git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -d"
[core]
excludesfile = /Users/alecf/.gitignore_global
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[mergetool "meld"]
cmd = /Applications/Meld.app/Contents/MacOS/Meld "$LOCAL" "$MERGED" "$REMOTE"
[merge]
tool = meld
[diff]
colorMovedWS = allow-indentation-change
[init]
defaultBranch = main
[pull]
rebase = false