diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/.gitconfig | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/home/.gitconfig b/home/.gitconfig index 813e98f..ef4a6c2 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -1,13 +1,15 @@ -[push] - default = matching +[alias] + dc = describe --contains + lg = format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit [branch] + autosetupmerge = always autosetuprebase = always [branch "master"] - remote = origin merge = refs/heads/master rebase = true + remote = origin [color] ui = auto @@ -16,31 +18,33 @@ whitespace = red reverse [core] - excludesfile = /home/astra/.gitignore - autocrlf = input abbrev = 12 - -[user] - name = David Kaufmann - email = astra@ionic.at + autocrlf = input + excludesfile = /home/astra/.gitignore [merge] tool = meld +[pretty] + fixes = Fixes: %h (\"%s\") + [pull] rebase = preserve +[push] + default = upstream + [rebase] - stat = true autostash = true + stat = true -[alias] - lg = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit - dc = describe --contains - -[pretty] - fixes = Fixes: %h (\"%s\") +[remote "origin"] + push = HEAD [svn] # push empty directory removals back to svn as directory deletes rmdir = true + +[user] + email = astra@ionic.at + name = David Kaufmann |