-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
83 lines (83 loc) · 2.62 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
[core]
editor = vim
excludesfile = ~/.files/gitignore_global
autocrlf = input
pager = diffy
[interactive]
diffFilter = diffy --color-only
[push]
default = simple
[gui]
editor = gvim
historybrowser = gitk
[diff]
tool = vimdiff
colorMoved = default
[diff "hex"]
textconv = hexdump -v -C
binary = true
[difftool]
prompt = false
trustExitCode = true
[difftool "vimdiff"]
cmd = vim -f -d -c \"wincmd l\" -c 'cd \"$GIT_PREFIX\"' \"$LOCAL\" \"$REMOTE\"
[color]
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "status"]
added = yellow
changed = red
untracked = cyan
[delta]
syntax-theme = Solarized (light)
[alias]
amend = commit --amend --no-edit
ap = add -p
br = branch
# mnemonic: Branches RECently checked-out
brec = !"git reflog | egrep -io 'moving from ([^[:space:]]+)' | awk '{ print $3 }' | awk ' !x[$0]++' | head -n8"
chp = cherry-pick
ci = commit -v
co = checkout
cob = !"git checkout $(git branch --all | fzf --no-multi --ansi --no-sort --preview 'git show --color=always {1} | diffy' | sed 's#remotes/origin/##')"
dc = diff --cached
df = diff
# view Diff in File After Pull
dfap = "!b=$(git rev-parse --abbrev-ref HEAD); git difftool $b@{1} $b"
dt = difftool
fixup = commit -m Fixup
fo ="!b=$(git rev-parse --abbrev-ref HEAD); git fetch origin $b"
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
ign = ls-files -o -i --exclude-standard
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --decorate --all
mt = mergetool
please = push --force-with-lease
ri = interactive-rebase
sha = !"rev=${1:-HEAD}; for i in $(seq 1 $#); do shift; done; git rev-parse --short $rev | tr -d '\n' | tee /dev/stderr | xclip -selection clipboard"
ssp = !"stash_id=${1:-0}; [ $# -gt 0 ] && shift; git stash show -p stash@{$stash_id}"
st = status
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = false
[include]
path = ~/.files/global_gituser
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[advice]
detachedHead = false
[pull]
rebase = true
[trim]
bases = develop,master
[url "[email protected]:"]
# Enforce SSH, see https://stackoverflow.com/a/36500841/3865876
insteadOf = https://github.com/