summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitconfig29
1 files changed, 22 insertions, 7 deletions
diff --git a/.gitconfig b/.gitconfig
index 4873314..8d61d96 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,13 +1,28 @@
+[alias]
+ adog = log --all --decorate --oneline --graph
+[branch]
+ sort = -committerdate
+[column]
+ ui = auto
+[commit]
+ verbose = true
+[diff]
+ algorithm = histogram
+ colorMoved = plain
+ mnemonicPrefix = true
+ renames = true
+[help]
+ autocorrect = prompt
[init]
defaultBranch = master
+[merge]
+ conflictstyle = zdiff3
+[pull]
+ rebase = true
[push]
- autoSetupRemote = true
-[commit]
- verbose = true
-[pager]
- log = false
+ autoSetupRemote = true
+[tag]
+ sort = version:refname
[user]
email = mail@mhsn.net
name = mhsn
-[alias]
- adog = log --all --decorate --oneline --graph