diff --git a/fish/conf.d/abbr.fish b/fish/conf.d/abbr.fish index 6fad334..f662507 100644 --- a/fish/conf.d/abbr.fish +++ b/fish/conf.d/abbr.fish @@ -20,7 +20,6 @@ abbr -a gdc 'git diff --cached' abbr -a gdh 'git diff --cached HEAD~' abbr -a gf 'git fetch --prune' abbr -a gl 'git logsearch -10' -abbr -a glo 'git log --oneline -10' abbr -a gr 'git restore' abbr -a gs 'git status' abbr -a gst 'git stash' diff --git a/git/config b/git/config index 63ae7d5..81ff6e0 100644 --- a/git/config +++ b/git/config @@ -1,9 +1,7 @@ [alias] aliases = config --get-regexp --includes alias 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(blue)%cs%C(reset) %C(yellow)%h%C(reset) %C(normal)%s%C(reset)' + logsearch = log --color=always --pretty=tformat:'%C(blue)%cs %C(auto)%h%d %s%C(reset)' rbi = rebase --interactive wipe = restore --staged --worktree [color "status"]