From ac11748360bf25c02ea0f8ce171ba019bf9ef45b Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 13 Apr 2014 21:31:17 +0200 Subject: gitconfig: add new alias; xinitrc: misc Signed-off-by: Florian Pritz --- .gitconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.gitconfig') diff --git a/.gitconfig b/.gitconfig index 8eebcf8..206f95e 100644 --- a/.gitconfig +++ b/.gitconfig @@ -16,8 +16,9 @@ b = branch -vv sup = log --all --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b' sp = show --stat -p - mff = merge + mff = merge --ff-only refl = reflog --date=relative + mnf = merge --no-ff [merge] tool = vimdiff conflictstyle = diff3 -- cgit v1.2.3-24-g4f1b