diff --git a/fish.configlink/functions/gittools.fish b/fish.configlink/functions/gittools.fish
index b142540..54295e4 100644
--- a/fish.configlink/functions/gittools.fish
+++ b/fish.configlink/functions/gittools.fish
@@ -4,19 +4,24 @@ function gittools
 
     function git-fuzzy-branch -a header
         set -l current (git rev-parse --abbrev-ref HEAD | tr -d '\n')
-        set -l branch (git branch --format "%(refname:short)" | fzf --height 50% --header='On $current, $header' --preview-window right:70% --preview 'git log {} --color=always --pretty=oneline | cut -d" " -f2-')
+        set -l branch (git branch \
+            --format "%(refname:short)" \
+            | fzf \
+                --height 50% \
+                --header="On $current, $header" \
+                --preview-window right:70% \
+                --preview 'git log {} --color=always --pretty="format:%C(auto)%ar %h%d %s"' \
+                )
         and echo $branch
     end
 
     function git-commits
-        set commitline (git log --pretty=oneline | fzf --height 50% --preview 'git show --color=always (echo {} | cut -d" " -f1)')
-        and set commit (echo $commitline | cut -d" " -f1)
-        and git checkout $commit
-    end
-
-    function git-branch
-        set branch (git branch --format "%(refname:short)" | fzf --height 50% --preview 'git log {} --pretty=oneline')
-        set commitline (git log --pretty=oneline | fzf --height 50% --preview 'git show --color=always (echo {} | cut -d" " -f1)')
+        set commitline (git log \
+            --pretty="format:%C(auto)%ar %h%d %s" \
+            | fzf \
+                --height 50% \
+                --preview 'git show --color=always (echo {} | cut -d" " -f4)' \
+                )
         and set commit (echo $commitline | cut -d" " -f1)
         and git checkout $commit
     end