summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--skel/.gitconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/skel/.gitconfig b/skel/.gitconfig
index 77fcfb8..604ada8 100644
--- a/skel/.gitconfig
+++ b/skel/.gitconfig
@@ -25,3 +25,9 @@
[merge]
tool = meld
+
+[pull]
+ rebase = preserve
+
+[alias]
+ lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit