Compare commits

..

2 Commits

Author SHA1 Message Date
Jordan Atwood 4f01f5e155
Add git git fixer alias 2 years ago
Jordan Atwood a9b5d929e3
Update RuneLite dev build merge branches 2 years ago
  1. 1
      src/.bin/open-runelite.sh
  2. 1
      src/.gitconfig

@ -14,7 +14,6 @@ BRANCHES_TO_MERGE=(
#differentiate-gauntlet-loots # conflicts with discord sub-regions #differentiate-gauntlet-loots # conflicts with discord sub-regions
charlie-texts charlie-texts
discord-sub-regions discord-sub-regions
toa-consumables
multi-step-cryptic-spade multi-step-cryptic-spade
quest-speedrunning-widget-overlays quest-speedrunning-widget-overlays
fixed-thrall-timer fixed-thrall-timer

@ -18,6 +18,7 @@
fixup = commit --amend --no-edit fixup = commit --amend --no-edit
fixup-a = commit -a --amend --no-edit fixup-a = commit -a --amend --no-edit
full-diff = !git --no-pager diff full-diff = !git --no-pager diff
git = "!f() { git "$@"; }; f" # ignore the duplicated "git"
ll = log --pretty=format:"%C(yellow)%h%C(red)%d%C(reset)\\ %s\\ %C(blue)%C(bold)[%aN]%C(reset)" --decorate --numstat ll = log --pretty=format:"%C(yellow)%h%C(red)%d%C(reset)\\ %s\\ %C(blue)%C(bold)[%aN]%C(reset)" --decorate --numstat
lo = log --oneline --decorate lo = log --oneline --decorate
ls = log --pretty=format:"%C(yellow)%h%C(red)%d%C(reset)\\ %s\\ %C(blue)%C(bold)[%aN]%C(reset)" --decorate ls = log --pretty=format:"%C(yellow)%h%C(red)%d%C(reset)\\ %s\\ %C(blue)%C(bold)[%aN]%C(reset)" --decorate

Loading…
Cancel
Save