diff options
| author | David Kaufmann <astra@ionic.at> | 2018-11-19 18:36:29 +0100 |
|---|---|---|
| committer | David Kaufmann <astra@ionic.at> | 2018-11-19 18:36:29 +0100 |
| commit | 4f1c3d6abe570532c8cafa8eaecc111e50108fe5 (patch) | |
| tree | f6f3febec471a3a553f62ef0f9191e8faf4c9095 | |
| parent | 4a0aa6f2f4a89656282ee4a40398b57980ff4c44 (diff) | |
| download | config-4f1c3d6abe570532c8cafa8eaecc111e50108fe5.tar.gz | |
reorder git config
| -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 |