forked from jawilson/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
41 lines (41 loc) · 1.69 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
[user]
name = Jeffery Wilson
email = jeff@jeffalwilson.com
[color]
ui = auto
[core]
autocrlf = input
[remote-hg]
hg-git-compat = true
[help]
autocorrect = 1
[alias]
co = checkout
ci = commit -v
svn-pretty-log = "! f() { git log -n 1000 --graph --color=always --pretty=format:\"%Cred%h%Creset%C(bold yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%Cred%b%Creset\" --date=relative \"$@\" | parse-git-svn-pretty-log | less -FRS; }; f"
pretty-log = log --graph --pretty=format:'%Cred%h%Creset%C(bold yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev=8 --date=relative
up = pull --rebase
diverge = ![ "$2" ] && HEAD=$2 || HEAD=HEAD && git diff $(git merge-base --octopus $1 $HEAD)..$HEAD
ldiverge = ![ "$2" ] && HEAD=$2 || HEAD=HEAD && git show $(git merge-base --octopus $1 $HEAD)..$HEAD
tarball = ![ "$3" ] && NAME=$3 || NAME=$(basename $(git rev-parse --show-toplevel)) && [ "$2" ] && REF=$2 || REF=HEAD && OUTPUT=$1/$NAME-$(git describe $REF | sed 's,^v,,').tar.gz && git archive --prefix=$NAME/ --output=$OUTPUT $REF^{tree} && readlink -m $OUTPUT && true
cd = !pushd $(git rev-parse --show-toplevel)
praise = blame
addnw = !sh -c 'git diff -w --no-color "$@" | git apply --cached --ignore-whitespace' -
sba = "!f() { [ \"$3\" ] && BRANCH=$3 || BRANCH=master && git subtree add --prefix $2 $1 $BRANCH --squash; }; f"
sbu = "!f() { [ \"$3\" ] && BRANCH=$3 || BRANCH=master && git subtree pull --prefix $2 $1 $BRANCH --squash; }; f"
[credential]
helper = cache
[push]
default = simple
[rerere]
enabled = 1
[merge]
tool = vimdiff
[mergetool]
keepBackup = false
[web]
browser = chrome
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true