Skip to content

Instantly share code, notes, and snippets.

View chrisjrob's full-sized avatar

chrisjrob chrisjrob

5 followers · 6 following
View GitHub Profile
@domcleal
domcleal / README.md
Last active May 8, 2017 13:32
Resolve simple git merge/rebase conflicts

Setup

  1. git clone https://gist.github.com/abef31ca104ecffa2d99fb904aadcf59.git git-merging
  2. cd git-merging

Merging

Merge the change-value branch into master, to bring in the change of value:

  1. git merge origin/change-value will fail with "Automatic merge failed; fix
@mattwhite
mattwhite / build-bash-lenny.sh
Last active August 29, 2015 14:06
Compile Bash 3.2 from source for Debian Lenny to patch the shellshock vulnerabilities (CVE-2014-6271, CVE-2014-7169, CVE-2014-6277, CVE-2014-6278, CVE-2014-7186, CVE-2014-7187)
# inspired by http://askubuntu.com/a/528171 and the comments below
# build bash 3.2, though this should work for other versions as well
BASH_MAJOR=3
BASH_MINOR=2
# prerequisites
sudo apt-get install build-essential gettext bison
# get bash source