-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy path.gitconfig
51 lines (48 loc) · 1.96 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
[include]
path = ~/dotfiles/gitconfig/public
[includeIf "gitdir:~/projects/"]
path = ~/dotfiles/gitconfig/private
[difftool]
prompt = false
[alias]
alias = config --get-regexp ^alias\\.
cp = cherry-pick
br = branch
co = checkout
lol = log --oneline --decorate --graph
st = status
bd = !sh -c 'git branch -D $1' -
bnuke = !sh -c 'git branch -D $1 || git push origin :$1' -
bdiff = diff master...HEAD
bvv = branch -vv
d = difftool
dc = diff --cc
diffc = diff --name-status --oneline
gn = "!git branch -vv | grep gone"
gr = !sh -c 'git rev-list --all | xargs git grep $1'
lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar) %C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --branches # only local branches
lgg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar) %C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all # all branches
lg0 = log --oneline
lgn = log --oneline --name-only --pretty=format:'%h %ce %cd - %s' --graph --stat -- . ':doc/*html'
logg = log --pretty=format:'%h %ce %cd - %s' --graph --stat
lognames = log --oneline --name-only --pretty=format:'%h %ce %cd - %s' --graph --stat
prd = !sh -c 'git co development && git pull && git co - && git rebase -i development' -
prm = pull --rebase=i origin master
rbd = rebase -i development
#for following to work https://github.com/jwiegley/git-scripts/blob/master/git-forest needs to be installed
#lg3 = forest --pretty=format:\"%C(red)%h %C(magenta)(%ar) %C(blue)%an %C(reset)%s\" --style=15 --reverse
[core]
excludesfile = ~/.gitignore
#editor = vim
#editor = "code --wait"
[diff]
tool = vdiff
[fetch]
prune = true
[difftool "vdiff"]
cmd = vdiff \"$LOCAL\" \"$REMOTE\"
# [difftool "sourcetree"]
# cmd = vdiff \"$LOCAL\" \"$REMOTE\"
# path =
[pull]
rebase = false