summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kaufmann <astra@ionic.at>2014-09-03 18:38:26 +0200
committerDavid Kaufmann <astra@ionic.at>2014-09-03 18:38:26 +0200
commit793e105b9110315625e94a3a6d3fcb15ac6d4dfd (patch)
treeed550d0c25d9d3e6f4f8cb4506c07b9fce32471d
parent5444b8e4a529f78acc06f60675fdb3e786fb2267 (diff)
downloadconfig-793e105b9110315625e94a3a6d3fcb15ac6d4dfd.tar.gz
update gitconfig
-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