-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
51 lines (50 loc) · 1.35 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
[user]
email = [email protected]
name = Ian Kariniemi
[credential]
helper = cache --timeout=3600
[core]
editor = nvim
trustctime = false
[color]
branch = auto
diff = auto
status = auto
[alias]
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
f = "!git ls-files | grep -i"
grep = grep -Ii
sl = stash list
sa = stash apply
ss = stash save
dlc = diff --cached HEAD^
diff = diff --word-diff
gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"
undo = "!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f"
# conflict/merges
ours = "!f() { git co --ours $@ && git add $@; }; f"
theirs = "!f() { git co --theirs $@ && git add $@; }; f"
new = !sh -c 'git log $1@{1}..$1@{0} "$@"'
[oh-my-zsh]
hide-status = 1
[push]
default = matching
[github]
user = hypnoticOxbow
[svn-remote "svn"]
automkdirs = false
[status]
submoduleSummary = true
[diff]
submodule = log
[gitlab "git.sift.net/api/v4"]
user = ikariniemi
[github "github.umn.edu/api/v4"]
user = karin010
[http]
postBuffer = 524288000
[pull]
ff = only
[init]
defaultBranch = master