From 8b1ec7f8264dc6edf87f6d78e7d0a357e4f7b98a Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Wed, 17 Oct 2018 00:01:26 +0200 Subject: gitconfig: sort branch list and improve fetch alias Signed-off-by: Florian Pritz --- .gitconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.gitconfig') diff --git a/.gitconfig b/.gitconfig index a122c4c..3921654 100644 --- a/.gitconfig +++ b/.gitconfig @@ -13,7 +13,7 @@ d = diff --stat -p am = am -s c = cherry -v - b = branch -vv + b = branch -vv --sort=committerdate sup = log --all --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b' sp = show --stat -p mff = merge --ff-only @@ -26,7 +26,8 @@ ri = rebase -i --autosquash fix = commit --fixup list-branches = branch --sort=committerdate --format='%(HEAD) %(color:red)%(objectname:short)%(color:reset) %(align:30)%(color:yellow)%(refname:short)%(color:reset)%(end) %(align:30)(%(color:green)%(committerdate:relative)%(color:reset))%(end) %(align:20)%(authorname)%(end) %(contents:subject)' - f = fetch -p --all + f = fetch -p + fa = fetch -p --all [merge] tool = kdiff3 conflictstyle = diff3 -- cgit v1.2.3-24-g4f1b