From c28f2b82d4dd855b2fde896aeaf949ef62151659 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 2 Sep 2019 09:25:24 +0200 Subject: [PATCH 1/2] Git shortcut to show history with diffs for a file --- .config/fish/config.fish | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 007a774..2c257b9 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -76,6 +76,7 @@ alias gst "git status" alias ga "git add -A" alias gl "git log" alias gls "git shortlog --summary" +alias gld "git log --follow -p -- " # Shows history with diffs for the filename provided alias gr "git reflog" alias gt 'git tag|less' #alias gad 'git log --pretty='"'"'%at'"'"' | while read d; do date -d "@$d"; done | awk '"'"'{print $1}'"'"' | sort | uniq -c' From fd766ceda634a53c85e9e47f11da85abf38a2405 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 2 Sep 2019 09:33:35 +0200 Subject: [PATCH 2/2] Cleaned up some unusued, old statusbar configs --- .tmux.conf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.tmux.conf b/.tmux.conf index c86a308..db09d3f 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -54,22 +54,12 @@ set -g status-bg colour234 set -g pane-border-style fg=colour245 set -g pane-active-border-style fg=colour39 set -g message-style fg=colour16,bg=colour221,bold -#set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]⮀' -# Status line with username: -#set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]' # Status line without username: set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour234,nobold]' -#set -g window-status-format "#[fg=colour235,bg=colour252,bold] #I #W " -#set -g window-status-format "#[fg=colour235,bg=colour252]#I #W#[fg=colour235,bg=colour252,bold]" -#set -g window-status-format "#[fg=colour234,bg=colour252,nobold]#I #W#[fg=colour252,bg=colour234,nobold]" set -g window-status-format "#[fg=colour252,bg=colour234,nobold] #I #W " -#set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=black,bg=colour39,noreverse,bold] #I: #W #[fg=colour39,bg=colour234,nobold]⮀" -#set -g window-status-current-format "#[fg=colour234,bg=colour39]#[fg=black,bg=colour39,noreverse,bold] #I: #W #[fg=colour39,bg=colour234,nobold]" -#set -g window-status-current-format "#[fg=colour234,bg=colour39]#[fg=black,bg=colour39,noreverse,bold] #I: #W #[fg=colour39,bg=colour234,nobold]" set -g window-status-current-format "#[fg=colour234,bg=colour39]#[fg=black,bg=colour39,noreverse,bold] #I #W #[fg=colour39,bg=colour234,nobold]" set -g window-status-separator "" set -g status-right '#(hostname) #[bg=#bbbbbb]#[fg=#000000] #(cut -d " " -f -3 /proc/loadavg) #[bg=#4e4e4e]#[fg=#ffffff]#(date +" %H:%M ")' -#  # Patch for OS X pbpaste and pbcopy under tmux. #set-option -g default-command "which reattach-to-user-namespace > /dev/null && reattach-to-user-namespace -l $SHELL || $SHELL"