Mercurial > dotfiles.old

changeset 119:7e18562d7570

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve gitconfig
author zegervdv <zegervdv@me.com>
date Mon, 22 Sep 2014 10:26:58 +0200
parents 17c53827a2e1
children fa0b6b2cbfb6
files gitconfig zshrc
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/gitconfig	Sun Sep 21 22:21:46 2014 +0200
+++ b/gitconfig	Mon Sep 22 10:26:58 2014 +0200
@@ -15,6 +15,7 @@
 [core]
         excludesfile = ~/.gitignore
         editor = vim
+	autocrlf = input
 [apply]
         whitespace = nowarn
 [mergetool]
@@ -42,3 +43,7 @@
 [filter "media"]
 	clean = git-media-clean %f
 	smudge = git-media-smudge %f
+[pull]
+	rebase = true
+[rerere]
+	enabled = true
--- a/zshrc	Sun Sep 21 22:21:46 2014 +0200
+++ b/zshrc	Mon Sep 22 10:26:58 2014 +0200
@@ -143,6 +143,7 @@
 alias vim="reattach-to-user-namespace vim"
 # alias ag="ag --color"
 alias dot="cd ~/.dotfiles"
+alias ranger="EDITOR=mvim ranger"
 
 # ag tab complete
 _ag() {