-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
30 lines (30 loc) · 1.4 KB
/
Copy path.gitconfig
File metadata and controls
30 lines (30 loc) · 1.4 KB
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
[init]
defaultBranch = master
[user]
name = Ivan Fedorov
[includeIf "gitdir:~/repos/"]
path = ~/.gitconfig.personal
[includeIf "gitdir:~/dotfiles/"]
path = ~/.gitconfig.personal
[includeIf "gitdir:~/work/"]
path = ~/.gitconfig.work
[includeIf "gitdir:/srv/nfs/ifedorov/work"]
path = ~/.gitconfig.work
[core]
editor = nvim
[push]
autoSetupRemote = true
[merge]
tool = nvimdiff
[alias]
lg1 = log --graph --abbrev-commit --decorate --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
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
lg = !"git lg1"
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"
[safe]
directory = /srv/nfs/ifedorov/work
directory = /srv/nfs/ifedorov/work/rupost
directory = /srv/nfs/ifedorov/work/rupost/**
directory = /srv/nfs/ifedorov/work/rupost/src/rupost-wizard
directory = /srv/nfs/ifedorov/work/rupost/builder/data/packages