Skip to content

Instantly share code, notes, and snippets.

@mikehale
Forked from austintaylor/post-merge
Created June 26, 2009 15:03
Show Gist options
  • Save mikehale/136550 to your computer and use it in GitHub Desktop.
Save mikehale/136550 to your computer and use it in GitHub Desktop.
#!/bin/sh
# Print out what changed in a nice format.
git log @{1}.. --pretty=format:"%Cblue%an%Creset %ar: %Cred\"%s%b\"%Creset (%h)" --reverse
#!/bin/sh
# Clean up whitespace in any modified files.
if git-rev-parse --verify HEAD > /dev/null
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
fi
old_IFS=$IFS
IFS=$'\n'
for FILE in `git-diff-index --check --cached $against 2>&1 | sed '/^[\*\+]/d' | sed 's/:.*//' | uniq` ; do
sed -ie 's/[[:space:]]*$//' $FILE
rm $FILE"e"
git add $FILE
done
IFS=$old_IFS
exit 0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment