diff --git a/fish/config.fish b/fish/config.fish index bd62ded..cd81c96 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -42,7 +42,8 @@ if status --is-interactive abbr -a -g gdc 'git diff --cached' abbr -a -g gdh 'git diff --cached HEAD~' abbr -a -g gf 'git fetch --prune' - abbr -a -g gl 'git log --oneline -10' + abbr -a -g gl 'git logsearch -10' + abbr -a -g glo 'git log --oneline -10' abbr -a -g gr 'git restore' abbr -a -g gs 'git status' abbr -a -g gst 'git stash' diff --git a/git/config b/git/config index c42e382..35c7a9c 100644 --- a/git/config +++ b/git/config @@ -9,7 +9,7 @@ branchsort = branch --sort='-committerdate' --format='%(HEAD) %(color:blue)%(committerdate:short)%(color:reset) %(if)%(worktreepath)%(then)%(color:reverse yellow)%(refname:short)%(color:reset)%(else)%(color:yellow)%(refname:short)%(color:reset)%(end) %(color:green)%(upstream:short)%(color:reset)' can = commit --amend --no-edit cand = commit --amend --no-edit --date=now - logsearch = log --color=always --format=tformat:'%C(green)%h%C(reset) %C(blue)%cs%C(reset) %C(normal)%s%C(reset)' + logsearch = log --color=always --format=tformat:'%C(yellow)%h%C(reset) %C(blue)%cs%C(reset) %C(normal)%s%C(reset)' rbi = rebase --interactive wipe = restore --staged --worktree [color]