New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check merge status in githook #10

wants to merge 1 commit into
Jump to file or symbol
Failed to load files and symbols.
+6 −4
Diff settings


Just for now

Check merge status in githook

Constant imagesnapping while attempting a rebase can really get in the way.
  • Loading branch information...
STRML committed Oct 7, 2014
commit 23f6feaf2ec2b17ae0ac96d7493dbc96113e9123
@@ -67,10 +67,12 @@ $ open snapshot.jpg
Add this to your git hooks in `.git/hooks/post-commit` and you'll be all set.
#!/usr/bin/env ruby
puts "Taking capture into #{file}!"
system "imagesnap -q -w 3 #{file}"
FILE="${HOME}/.gitshots/$(date +%s).jpg"
if [ ! -f "../../rebase-merge" ]; then
echo "Taking capture into $FILE!"
imagesnap -q -w 3 $FILE &
exit 0