summaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig5
1 files changed, 3 insertions, 2 deletions
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