forked from searls/icloud-dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
101 lines (100 loc) · 2.89 KB
/
.gitconfig
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
90
91
92
93
94
95
96
97
98
99
100
101
[user]
name = Frederic Barthelemy
email = [email protected]
signingkey = 9D2B3E7C1526516EE90FAF126FF43C49A5D473EF
[branch]
autosetupmerge = true
[pull]
rebase = false
[alias]
st = status
co = checkout
sw = switch
cp = cherry-pick
ci = commit
br = branch
df = diff
lg = log -p
lh = log -n1 --pretty=format:%H
x = !open -a /Applications/GitX.app .
# x = !open -a /Users/fbarthelemy/Code/gitx/build/Debug/GitX.app .
vn = !"cat submodules/narwhal/build/Current/NGCore/Client/Core/Capabilities.js | grep \"this._fields = \" | awk '{gsub(/'\"'\"'g*};|'\"'\"'g/,\"\")}{print $8}'"
conar = !"git co `git vn`"
cleanup = !"git reflog expire --expire=1.minute refs/heads/main; git fsck --unreachable && git prune && git gc"
current = !"git rev-parse --abbrev-ref HEAD"
currentpb = !"git current | tr -d '\n' | pbcopy"
pa = pushall
pushall = !pushall
amend-reuse = commit --amend -C HEAD --reset-author
git = !git
gst = status
gofmt = !git status --porcelain | sed -E "'s( [A-Z] (./('" | grep ".go$" | xargs -n1 go fmt
bclean = "!f() { git branch --merged ${1-main} | grep -v " ${1-main}$" | xargs -n 1 git branch -d; }; f"
apply-gitignore = !git ls-files -ci --exclude-standard -z | xargs -0 git rm --cached
split = !git-split
showlocal = !git-showlocal
prunelocal = !git-prunelocal
recent = !git-recentco
recentco = !git-recentco
reauthor = !sh -c 'eval `git log --reverse --topo-order --pretty=format:\"git cherry-pick %H && git commit --amend -C %H --author=\\\"%aN <%aE>\\\" && \" $0 ` "echo success" '
stash-rename = "!_() { rev=$(git rev-parse $1) && git stash drop $1 || exit 1 ; git stash store -m \"$2\" $rev; }; _"
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
#[merge]
# tool = "FileMerge"
#[mergetool "FileMerge"]
# cmd = "/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge -left \"$REMOTE\" -right \"$LOCAL\" -ancestor \"$BASE\" -merge \"$MERGED\""
[merge]
keepBackup = false;
tool = p4merge
[mergetool "p4merge"]
cmd = "p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
keepTemporaries = false
trustExitCode = false
keepBackup = false
#[diff]
# external = p4diff
[mergetool]
keepBackup = false
[diff "localizablestrings"]
textconv = "iconv -f utf-16 -t utf-8"
[push]
default = matching
[advice]
pushNonFastForward = false
statusHints = false
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[core]
excludesfile = /Users/fbarthelemy/.gitignore_global
[diff]
compactionHeuristic = true
[commit]
gpgsign = true
[gpg]
program = gpg
[grep]
lineNumber = false
[init]
defaultBranch = main
# Git Delta https://github.com/dandavison/delta
[core]
pager = delta
[delta]
syntax-theme = GitHub