Compare commits

..

No commits in common. 'b373f0a1b916b65c3687ae63f7f4a916f9933223' and 'a4a31abcebae2bc450dab29476802c7fef07ac32' have entirely different histories.

  1. 3
      src/.bin/music-transfer.py
  2. 1
      src/.bin/open-runelite.sh
  3. 1
      src/.gitconfig

@ -78,9 +78,6 @@ for line in open(paths_file, 'r'):
source_files.add(file_path)
else:
print(f'[TRACE] Unknown file extension of entry: {file}', file=sys.stderr)
elif not path.exists():
print(f'[ERROR] Could not find source path: {path}')
sys.exit(3)
if len(source_files) == 0:
print('No source files to transfer')

@ -17,6 +17,7 @@ BRANCHES_TO_MERGE=(
multi-step-cryptic-spade
quest-speedrunning-widget-overlays
fixed-thrall-timer
fix-grand-exchange-offer-slot-wrapping
gwd-altar-timer
)
MAX_AGE_BEFORE_REBUILD="$(( 18 * 60 * 60 ))" # 18 hours

@ -14,7 +14,6 @@
[ $# -ne 2 ] && echo 'Two arguments required, PR # and branch name' && exit 1; \
git fetch upstream pull/$1/head:$2-$1 && git checkout $2-$1 && git merge master --no-gpg-sign --no-edit; \
}; f"
c- = checkout -
diffc = diff --cached
fixup = commit --amend --no-edit
fixup-a = commit -a --amend --no-edit

Loading…
Cancel
Save