commit 8ad18c147662eba3930dc2e6c1d44830cd950ff8 Author: Natercio Moniz Date: Sun Jan 26 09:41:21 2025 +0000 Initial commit diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..77585ad --- /dev/null +++ b/.gitconfig @@ -0,0 +1,85 @@ +# This is Git's per-user configuration file. +[user] + name = Natercio Moniz + email = natercio.moniz@gmail.com + +[alias] + a = add + aa = add --all + + br = branch + brd = branch -D + brp = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short) %(if:equals=)%(upstream:short)%(then)%(color:red)local only%(else)%(color:green)with remote%(end)%(color:reset) %(committerdate:relative)' + + ch = checkout + chm = !sh -c 'git checkout $(git mbr)' + chb = checkout -b + + co = commit --status + coa = commit --status --all + + di = diff + dis = diff --stat + dih = diff HEAD + dihs = diff --stat HEAD + dib = !sh -c 'git diff "$(git mbase)"' + dibs = !sh -c 'git diff --stat "$(git mbase)"' + + + l = log + lf = log --follow + lfp = log --follow --patch + + llast = log -n 1 + llastby = log -n 1 --author + + lp = log --graph --format=format:'%C(yellow)%h%Creset by %aN (%ad - %ar)%Cred%d%n%Cblue%s' + lpb = !sh -c 'git lp "$(git mbase).."' + lpa = lp --all + + mbr = !sh -c 'echo $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')' + mbase = !sh -c 'git merge-base HEAD $(git mbr)' + + m = merge + mtheirs = merge --strategy-option theirs + mours = merge --strategy-option ours + mc = merge --continue + ma = merge --abort + mm = !sh -c 'git merge $(git mbr)' + + pushsu = !sh -c 'git push origin -u "$(git rev-parse --abbrev-ref HEAD)"' + + pul = pull origin --prune + + rb = rebase --autostash + rbm = !sh -c 'git rebase --autostash $(git mbr)' + rbc = rebase --continue + rba = rebase --abort + + rsb = !sh -c 'git reset "$(git mbase)"' + + ss = stash --include-untracked + sp = stash pop + sl = stash list --stat + slp = stash list -p + + st = status -b --short + + suup = submodule update + suupr = submodule update --remote +[core] + editor = nvim + excludesfile = /Users/natercio/Workspace/core/tools/.gitignore-global +[pull] + rebase = false +[push] + autoSetupRemote = true + default = current +[diff] + external = difft + +[filter "lfs"] + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process