-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
62 lines (62 loc) · 2.4 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
[user]
email = [email protected]
name = Tamino Bauknecht
[core]
editor = nvim
autocrlf = input
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[init]
defaultBranch = main
[oh-my-zsh]
hide-dirty = 1
[pull]
ff = only
[push]
default = current
autoSetupRemote = true
[commit]
gpgsign = true
[fetch]
all = true
prune = true
recurseSubmodules = yes
parallel = 0
[submodule]
recurse = true
[color]
diff = auto
status = auto
branch = auto
[alias]
s = status
d = diff
ds = diff --staged
qcommit = commit --no-gpg-sign
qc = qcommit
stash-abort = reset --merge
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(auto)%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(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
lg3 = 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 cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)' --all
edit-unmerged = \
"!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; nvim `f`"
add-unmerged = \
"!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
diff-untracked = \
"! for next in $( git ls-files --others --exclude-standard ) ; do git diff --no-index /dev/null $next; done;"
# git follow <filename> <linefrom> [<lineto>] [<starting_at_ref>]
follow = "! \
if [[ $1 == \"/\"* ]]; then \
FILE="$1"; \
else \
FILE="${GIT_PREFIX}$1"; \
fi; \
git log -wbp --ignore-blank-lines --topo-order -uL $2,${3:-$2}:\"${FILE}\" $4;' --"
origin-reset = \
"! git reset \"$(git rev-parse --abbrev-ref --symbolic-full-name @{u})\""
submodule-update = git submodule update --init --recursive --progress
#[merge]
# conflictstyle = diff3