Skip to content

Instantly share code, notes, and snippets.

Avatar

JP Blanchette jpblancoder

  • Toronto, Canada
View GitHub Profile
@jpblancoder
jpblancoder / pb-release-diff.md
Created Mar 7, 2019
Diff PB release build folders
View pb-release-diff.md

Quick diff of origin build folders

  • Diff the origin build folders JS files.
git diff-tree --stat=110 -r origin/release-3_0_22 origin/release-3_0_23 -- resources/scripts/build
git diff-tree --name-status -r origin/release-3_0_22 origin/release-3_0_23 -- resources/scripts/build

Better diff of local folders

  • Track the release branches in separate local git repos, and diff the build folders.
  • This will compare the JS filenames and also the file contents.
View Github_Open-a-pull-request.gitconfig
[alias]
bname = !git rev-parse --abbrev-ref HEAD
gh = !open \"$(git remote -v | ag origin | ag push | cut -f 2 | cut -d \" \" -f 1 | sed -e \"s|git@\\(.*\\):\\(.*\\).git|https://\\1/\\2|\")/tree/$(git bname)\"
ghpr = !git ghpr-d
ghpr-d = !open \"$(git remote -v | ag origin | ag push | cut -f 2 | cut -d \" \" -f 1 | sed -e \"s|git@\\(.*\\):\\(.*\\).git|https://\\1/\\2|\")/pull/new/dev...$(git bname)\"
ghpr-dd = "!f() { git diff-tree --name-status -r origin/dev \"$(git bname)\"; git diff-tree --shortstat -r origin/dev \"$(git bname)\";}; f"
ghpr-ddd = "!f() { git diff-tree --stat=110 -r origin/dev \"$(git bname)\";}; f"
ghpr-s = !open \"$(git remote -v | ag origin | ag push | cut -f 2 | cut -d \" \" -f 1 | sed -e \"s|git@\\(.*\\):\\(.*\\).git|https://\\1/\\2|\")/pull/new/staging...$(git bname)\"
ghpr-ss = "!f() { git diff-tree --name-status -r origin/staging \"$(git bname)\"; git diff-tree --shortstat -r origin/staging \"$(git bname)\";}; f"
ghpr-sss = "!f() { git diff-tree --stat=110 -r origi