mirror of
https://gitea.zaclys.com/yannic/dotfiles.git
synced 2026-07-28 17:22:49 +02:00
54 lines
1.1 KiB
Cheetah
54 lines
1.1 KiB
Cheetah
[alias]
|
|
a = add
|
|
ahead-of-master = log --oneline origin/master..HEAD
|
|
b = "!git checkout $(git branch | fzf)"
|
|
c = commit
|
|
clear = clean -fd
|
|
co = checkout
|
|
cd = checkout develop
|
|
cm = checkout master
|
|
cp = cherry-pick
|
|
f = fetch -p
|
|
nb = checkout -b
|
|
p = push -u origin
|
|
pf = p --force-with-lease
|
|
s = status
|
|
track = "!for BRANCH in $(git branch -a | grep remotes | grep -v HEAD); do git branch --track \"${BRANCH#remotes/origin/}\" \"${BRANCH}\"; done"
|
|
untrack = "!for BRANCH in $(git branch | grep -v '*'); do git branch -D \"${BRANCH}\"; done"
|
|
sync = "!git untrack && git gc && git f && git track"
|
|
|
|
[core]
|
|
pager = delta
|
|
autocrlf = input
|
|
|
|
[credential]
|
|
helper = store
|
|
[credential "https://github.com"]
|
|
helper = cache
|
|
|
|
[include]
|
|
path = ~/.config/delta/themes.gitconfig
|
|
path = ~/.gitconfig_custom.inc
|
|
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
|
|
[delta]
|
|
features = arctic-fox
|
|
navigate = true # use n and N to move between diff sections
|
|
side-by-side = false
|
|
|
|
[merge]
|
|
conflictStyle = zdiff3
|
|
|
|
[pull]
|
|
rebase = true
|
|
|
|
[push]
|
|
default = current
|
|
|
|
[user]
|
|
email = {{ .git_email }}
|
|
name = {{ .git_alias }}
|
|
|