diff options
Diffstat (limited to 'git/config')
| -rw-r--r-- | git/config | 37 |
1 files changed, 16 insertions, 21 deletions
@@ -1,16 +1,3 @@ -[user] - name = deadguy - email = dgy@texto-plano.xyz - signingkey = E276608B5A49E3D3! -[init] - defaultBranch = main -[sendemail] - from = "deadguy <dgy@texto-plano.xyz>" - smtpuser = dgy - smtpserver = texto-plano.xyz - smtpserverport = 587 - smtpencryption = tls - suppresscc = self [alias] st = status co = checkout @@ -23,11 +10,10 @@ amend = commit --amend -v full = show --format=fuller noed = commit --amend --no-edit - vl = log --color --stat --pretty=fuller - tr = log --graph --date-order --date=short --pretty=format:'%C(cyan)%h%Creset -%C(auto)%d %C(yellow)%s %C(blue)(%ar) %Creset<%an>' - fz = !sha=$( git -c color.ui=auto log --oneline -n 1000 | fzf +s --no-multi --prompt 'Fixup> ' ) && git commit --fixup "${sha%% *}" - fr = !sha=$( git -c color.ui=auto log --oneline -n 1000 | fzf +s --no-multi --prompt 'Revert> ' ) && git revert "${sha%% *}" - wd = "!f() { git --paginate diff --dirstat=cumulative,files,0 ${1:-HEAD} | awk '{print $2}' | cut -d / -f1-${2:-4} | sort | uniq; }; f" + history = log --graph --date-order --date=short --decorate --pretty=format:'%C(yellow)%h%Creset %C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' + detailed = log --color --stat --pretty=fuller + fixups = !sha=$( git -c color.ui=auto log --oneline -n 1000 | fzf +s --no-multi --prompt 'Fixup> ' ) && git commit --fixup "${sha%% *}" + reverts = !sha=$( git -c color.ui=auto log --oneline -n 1000 | fzf +s --no-multi --prompt 'Revert> ' ) && git revert "${sha%% *}" [http] sslVerify = true @@ -35,7 +21,7 @@ [core] autocrlf = input whitespace = warn - excludesfile = /home/ghoul/.config/git/gitignore + excludesfile = ~/.config/git/gitignore pager = "{ \ COLUMNS=$(tput cols); \ if [ $COLUMNS -ge 80 ] && [ -z $FZF_PREVIEW_COLUMNS ]; then \ @@ -99,6 +85,7 @@ tool = nvimdiff renames = copies submodule = log + compactionHeuristic = true [difftool "nvimdiff"] cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\" @@ -117,6 +104,11 @@ branch = auto ui = auto +[color "decorate"] + HEAD = cyan + branch = yellow + tag = magenta + [rerere] enabled = true @@ -125,7 +117,7 @@ extendRegexp = true [gpg] - program = gpg2 + program = gpg [log] decorate = short @@ -133,6 +125,9 @@ [include] path = config.local +[blame] + coloring = highlightRecent + date = human + [help] autocorrect = 1 - |