summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2017-06-13 11:20:18 +0200
committerFlorian Pritz <bluewind@xinu.at>2017-06-13 11:20:18 +0200
commit4c7f3d60129d8efd846aa6bdd3e220cbb91a6488 (patch)
tree6638859ec98476d318a15a9dfb38ee6b74e9d778
parent5527df94488501b3877b9758ea14c563d7b1b70f (diff)
downloaddotfiles-4c7f3d60129d8efd846aa6bdd3e220cbb91a6488.tar.gz
dotfiles-4c7f3d60129d8efd846aa6bdd3e220cbb91a6488.tar.xz
Add git list-branches alias
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--.gitconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index cd6037b..e406745 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -25,6 +25,7 @@
dw = diff --color-words
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)'
[merge]
tool = kdiff3
conflictstyle = diff3