Cleanup git configuration

Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2017-08-07 11:10:45 +02:00
parent 51926cb7d5
commit b559e0ecc4
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E

View file

@ -26,7 +26,7 @@
renames = true renames = true
[push] [push]
default = tracking default = upstream
gpgSign = if-asked gpgSign = if-asked
[alias] [alias]
@ -37,12 +37,9 @@
co = checkout co = checkout
df = diff df = diff
lg = log -p lg = log -p
cues = blame
elog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
starecopu = "!sh -c 'git stash && git pull --rebase && git stash pop && git commit -am \"$0\" && git push'" starecopu = "!sh -c 'git stash && git pull --rebase && git stash pop && git commit -am \"$0\" && git push'"
spps = "!sh -c 'git stash && git pull --rebase && git push && git stash pop'" spps = "!sh -c 'git stash && git pull --rebase && git push && git stash pop'"
pp = "!sh -c 'git pull --rebase && git push'" pp = "!sh -c 'git pull --rebase && git push'"
squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -
ri = rebase --interactive --autosquash ri = rebase --interactive --autosquash
lg = "log --color --graph --pretty=format:'%Cred%h%Creset [%G?]%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" lg = "log --color --graph --pretty=format:'%Cred%h%Creset [%G?]%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
sign-rebase = "!GIT_SEQUENCE_EDITOR='sed -i -re s/^pick/e/' sh -c 'git rebase -i $1 && git commit --amend -S --no-edit && while git rebase --continue; do git commit --amend -S --no-edit; done' -" sign-rebase = "!GIT_SEQUENCE_EDITOR='sed -i -re s/^pick/e/' sh -c 'git rebase -i $1 && git commit --amend -S --no-edit && while git rebase --continue; do git commit --amend -S --no-edit; done' -"
@ -51,7 +48,7 @@
denyNonFastForwards = true denyNonFastForwards = true
[rerere] [rerere]
enabled = 1 enabled = true
[gpg] [gpg]
program = gpg2 program = gpg2