Merge branch 'master' of ssh://git.lyte.dev:2222/lytedev/dotfiles

This commit is contained in:
Daniel Flanagan 2019-11-28 08:29:19 -06:00
commit 14d0b0f9ab
3 changed files with 5 additions and 2 deletions

View file

@ -35,6 +35,8 @@
pl = pull
pf = push --force-with-lease
a = add -A
cnv = commit --no-verify
c = commit
[merge]
tool = nvimdiff

View file

@ -88,6 +88,7 @@ alias gpa="git push --all && git push --tags"
alias gpt="git push && git push --tags"
alias gpf="git push --force-with-lease"
alias gac="git add -A && git commit"
alias gacnv="git add -A && git commit --no-verify"
alias gsur="git submodule update --remote"
alias glf="git ls-files"
alias gl="git log --pretty=format:\"%h %ad%x09%an%x09%s\" --date=short"

View file

@ -63,8 +63,8 @@ set -g status-left "#[fg=colour7]#(~/.config/dotfiles/bin/tmux-session-list #S)"
bind-key O run-shell "~/.config/dotfiles/bin/tmux-save-buffer #S" \; display-message "Saved buffer to ~/<date>.tmux-buffer.log"
# pane split line colors
set -g pane-active-border-style bg=black,fg=black
set -g pane-border-style fg=black
set -g pane-active-border-style bg=black,fg=blue
set -g pane-border-style bg=black,fg=colour18
# cLocK mOdE Is sUpEr 3LeEt
set -g clock-mode-colour colour8