diff options
| author | Jesse Luehrs <doy@tozt.net> | 2024-02-22 23:02:55 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2024-02-22 23:02:55 -0500 |
| commit | 44ce00838e967a1f95b4e55cd4b57fa7aa3f4456 (patch) | |
| tree | 2f2e0a9131d3801f7b33342a744e7651793454dd | |
| parent | d04f8bb18b1c2a7e551cc5da86a1b7a758d63da3 (diff) | |
| download | conf-44ce00838e967a1f95b4e55cd4b57fa7aa3f4456.tar.gz conf-44ce00838e967a1f95b4e55cd4b57fa7aa3f4456.zip | |
git config updates
| -rw-r--r-- | git/.config/git/config | 20 | ||||
| -rw-r--r-- | git/.config/git/ignore | 9 |
2 files changed, 6 insertions, 23 deletions
diff --git a/git/.config/git/config b/git/.config/git/config index b8092d8..4266d22 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -16,35 +16,23 @@ file-size = !~/.bin/git/git-file-size fixup = "!f() { git record --fixup \"$@\"; }; f" gc-aggressive = "!f() { git repack -Abd --window=250 --depth=250 --window-memory=1g && git prune --expire \"1 day ago\" && rm -f .git/gc.log && git gc; }; f" - imerge = !~/.bin/git/git-imerge - info = remote show -n origin lg = log --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %C(bold blue)%aN%Creset %C(magenta)(%ar)%Creset%n%s%n' --abbrev-commit --date=relative --stat=72 pr = !~/.bin/git/git-pr - prune-all = !git remote | xargs -n 1 git remote prune record = !~/.bin/git/git-record refix = "!f() { env EDITOR=true git rebase -i \"$@\"; }; f" re = rebase -i @{u} ri = rebase -i root = !~/.bin/git/git-root rv = checkout -p - stashed = stash list --pretty=format:'%<(10)%gd: %Cred%h%Creset %Cgreen(%ar)%Creset%n %s' st = status -sb start = "!f() { git commit --allow-empty -m 'initial commit' && git add . && git commit -m 'project skeleton'; }; f" track = "!f() { local name=$(git name-rev --name-only --exclude='branchless/*' @); git branch --set-upstream-to=origin/$name $name; }; f" [github] user = doy -[color] - ui = auto [core] - excludesfile = ~/.config/git/ignore pager = delta - untrackedCache = true -[push] - default = current -[branch] - autosetuprebase = always [merge] - conflictstyle = diff3 + conflictstyle = zdiff3 [rebase] autosquash = true autostash = true @@ -52,7 +40,7 @@ autocorrect = 5 [diff] mnemonicprefix = true - external = difft + algorithm = histogram [advice] pushUpdateRejected = false statusHints = false @@ -75,5 +63,9 @@ defaultBranch = main [submodule] recurse = true +[push] + autosetupremote = true +[commit] + verbose = true ; vim:ft=gitconfig: diff --git a/git/.config/git/ignore b/git/.config/git/ignore index 336895e..dd33554 100644 --- a/git/.config/git/ignore +++ b/git/.config/git/ignore @@ -1,10 +1 @@ -# ignore vim swap files -.*.sw? -# openoffice lock files -.~lock.* -# prove state files -.prove -# ctags files -tags -tags-ja .obsidian |