-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
47 lines (47 loc) · 1.55 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
[user]
email = [email protected]
name = Axel Nyffenegger
[core]
editor = nvim
excludesfile = /home/axnyff/.gitignore_global
[push]
default = simple
[rebase]
autosquash = true
[help]
autocorrect = 3
[alias]
git = ! exec git
pushf = push --force-with-lease
pushu = ! git push -u origin `git rev-parse --abbrev-ref HEAD`
pushup = ! git pushu 2>&1 | awk '/https/ {print $2}' | xargs xdg-open > /dev/null
kill-branches = "!f() { git branch | awk '!/^*|master/ {print $1 }' | xargs git branch ${1--d};}; f"
go = "!f() { git fetch origin \"$1\" && git checkout \"$1\"; }; f"
ctags = !.git/hooks/ctags
wip = !git add -A && git commit -m "Wip"
wipush = !git wip && git push
wipushf = !git wip && git pushf
wipushu = !git wip && git pushu
wipushup = !git wip && git pushup
pr = !git wipushup
lol = "log --graph --decorate --pretty=format:\"%Cred%h %Cblue%an %ai %Cgreen %s\""
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
fuck = ! git pull --rebase && git push
co = checkout
edit = commit --amend
amend = commit --amend --no-edit
kill-branches = "!f() { git branch | awk '!/^\\*|master/ {print $1 }' | xargs git branch ${1--d};}; f"
showp = show --shortstat
squash = ! bash -c 'source $HOME/.vim/git_functions.sh && squash_commit_in_branch'
feat = flow feature start
hotfix = flow hotfix start
[init]
templatedir = ~/.vim/git_template
defaultBranch = main
[merge]
tool = diffconflicts
[mergetool "diffconflicts"]
cmd = vim -c DiffConflicts \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
trustExitCode = true
[mergetool]
keepBackup = false