|
| 1 | +# -*-mode:gitconfig-*- vim:ft=gitconfig |
| 2 | +# -*-mode:ini-*- vim:ft=dosini |
| 3 | + |
| 4 | +# ~/.gitinclude |
| 5 | +# ============================================================================= |
| 6 | +# User-specific Git configuration file. |
| 7 | +# |
| 8 | +# See https://git-scm.com/docs/git-config |
| 9 | +# |
| 10 | +# {{- /* This file supports Go's text/template language. */ -}} |
| 11 | +# |
| 12 | +# Sources: |
| 13 | +# https://delicious-insights.com/en/posts/mastering-git-submodules/ |
| 14 | +# https://github.com/haacked/dotfiles |
| 15 | +# https://github.com/holman/dotfiles |
| 16 | +# https://github.com/jayharris/dotfiles-windows |
| 17 | +# https://github.com/mathiasbynens/dotfiles |
| 18 | +# https://git-scm.com/docs/git-config/ |
| 19 | + |
| 20 | +[alias] |
| 21 | + br = branch |
| 22 | + ci = commit |
| 23 | + co = checkout |
| 24 | + co-ours = checkout --ours |
| 25 | + co-theirs = checkout --theirs |
| 26 | + coi = checkout-index |
| 27 | + coi-ours = checkout-index -f -a --stage=2 |
| 28 | + coi-theirs = checkout-index -f -a --stage=3 |
| 29 | + cp = cherry-pick |
| 30 | + df = diff --color=never |
| 31 | + ds = diff --stat --color=never |
| 32 | + ds = diff --staged --color=never |
| 33 | + g = grep --break --heading --line-number |
| 34 | + last = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white)%an, %ar%Creset' -n 20 |
| 35 | + lc = log ORIG_HEAD.. --stat --no-merges |
| 36 | + lp = log --patch --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white)%an, %ar%Creset' |
| 37 | + ls = log --stat --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white)%an, %ar%Creset' |
| 38 | + mt = mergetool -y |
| 39 | + pu = pull |
| 40 | + pul = pull |
| 41 | + pus = push |
| 42 | + rb = rebase |
| 43 | + rbc = rebase --continue |
| 44 | + rbs = rebase --skip |
| 45 | + rl = reflog |
| 46 | + rp = remote prune |
| 47 | + rs = remote show |
| 48 | + rt = remote |
| 49 | + ru = remote update |
| 50 | + sb = show-branch |
| 51 | + st = status -s |
| 52 | + push-all = push --follow-tags |
| 53 | + pa = push-all |
| 54 | + |
| 55 | + catchup = log --patch --reverse --topo-order _ribbon..origin/main |
| 56 | + changes = diff --name-status -r |
| 57 | + delete-merged = !git pull --prune && git branch --merged | grep -v '*' | xargs -n 1 git branch -d |
| 58 | + diffall = diff HEAD --color=never |
| 59 | + diffstat = diff --stat --color=never |
| 60 | + fetch-all = fetch --depth=999999999 |
| 61 | + forget = rm --cached |
| 62 | + lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
| 63 | + merge-ours = !git checkout --ours . && git add -u && git commit |
| 64 | + merge-theirs = !git checkout --theirs . && git add -u && git commit |
| 65 | + pop = stash pop |
| 66 | + push-new = !git push -u origin `git rev-parse --abbrev-ref HEAD` |
| 67 | + reset-origin = !git fetch && git reset --hard "origin/`git rev-parse --abbrev-ref HEAD`" |
| 68 | + ribbon = tag --force _ribbon origin/main |
| 69 | + root = !pwd |
| 70 | + serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git |
| 71 | + stage = add |
| 72 | + staged = diff --staged |
| 73 | + tags = tag -l |
| 74 | + track = checkout -t |
| 75 | + undo = reset --soft HEAD^ |
| 76 | + unstage = reset HEAD |
| 77 | + unstaged = diff |
| 78 | + unstash = stash apply |
| 79 | + who = shortlog -s -- |
0 commit comments