2021-08-14 02:35:38 +00:00
|
|
|
#!/usr/bin/env bash
|
|
|
|
|
2023-10-10 10:50:47 +00:00
|
|
|
# Global aliases
|
2022-11-25 04:47:49 +00:00
|
|
|
git config --global alias.ass add
|
2021-08-14 02:35:38 +00:00
|
|
|
git config --global alias.br branch
|
|
|
|
git config --global alias.ci commit
|
|
|
|
git config --global alias.cl clone
|
|
|
|
git config --global alias.co checkout
|
2022-10-11 05:47:46 +00:00
|
|
|
git config --global alias.df "diff -w"
|
2023-10-10 10:50:47 +00:00
|
|
|
git config --global alias.dfc "diff -w --cached"
|
2021-12-13 06:53:30 +00:00
|
|
|
git config --global alias.fe "fetch --all --tags"
|
2021-11-27 05:14:35 +00:00
|
|
|
git config --global alias.lg "log --stat"
|
2022-05-26 07:12:23 +00:00
|
|
|
git config --global alias.lg1 "log --oneline"
|
2022-11-25 05:37:00 +00:00
|
|
|
git config --global alias.me merge
|
2021-12-13 06:53:30 +00:00
|
|
|
git config --global alias.pl "pull --tags"
|
2021-08-14 02:35:38 +00:00
|
|
|
git config --global alias.ps push
|
2023-09-24 15:04:54 +00:00
|
|
|
git config --global alias.psa "!git remote | xargs -L1 git push"
|
|
|
|
git config --global alias.psaf "!git remote | xargs -L1 git push --force-with-lease"
|
|
|
|
git config --global alias.psf "push --force-with-lease"
|
2023-02-22 10:04:41 +00:00
|
|
|
git config --global alias.rank "shortlog -nse --no-merges"
|
2021-08-14 02:35:38 +00:00
|
|
|
git config --global alias.st status
|
|
|
|
git config --global alias.sw switch
|
2021-11-29 02:42:34 +00:00
|
|
|
git config --global alias.tg "tag --sort=-version:refname"
|
2021-08-14 02:35:38 +00:00
|
|
|
|
|
|
|
# Misc
|
2022-09-13 09:24:45 +00:00
|
|
|
git config --global core.fsmonitor true
|
2023-10-06 07:37:32 +00:00
|
|
|
git config --global diff.colorMoved no
|
2021-08-14 02:35:38 +00:00
|
|
|
git config --global fetch.prune true
|
|
|
|
git config --global init.defaultBranch main
|
2022-06-23 08:38:49 +00:00
|
|
|
git config --global merge.conflictstyle diff3
|
2022-09-13 09:24:45 +00:00
|
|
|
git config --global pull.rebase true
|
|
|
|
git config --global pull.twohead ort
|
2022-07-03 14:36:57 +00:00
|
|
|
git config --global push.autoSetupRemote true
|
2023-01-13 17:02:48 +00:00
|
|
|
git config --global rebase.stat true
|
2023-10-06 07:33:59 +00:00
|
|
|
|
|
|
|
# https://github.com/dandavison/delta
|
|
|
|
git config --global core.pager delta
|
|
|
|
git config --global delta.navigate true
|
2023-10-06 08:36:50 +00:00
|
|
|
git config --global delta.file-decoration-style none
|
|
|
|
git config --global delta.hunk-header-decoration-style none
|
2023-10-10 10:50:47 +00:00
|
|
|
|
|
|
|
# https://github.com/Wilfred/difftastic
|
|
|
|
git config --global diff.tool difftastic
|
|
|
|
git config --global difftool.prompt false
|
|
|
|
git config --global difftool.difftastic.cmd 'difft "$LOCAL" "$REMOTE"'
|
|
|
|
git config --global pager.difftool true
|
|
|
|
git config --global alias.dft "difftool"
|
|
|
|
git config --global alias.dfct "difftool --cached"
|