Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Only stash/rebase if the remote branch has commits ours does not.

  • Loading branch information...
commit 1b137bb186260f0447a5b8c3741ac964288bfe8a 1 parent 2ed06ab
@eventualbuddha eventualbuddha authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  bin/hack
View
3  bin/hack
@@ -184,7 +184,8 @@ else
git fetch $REMOTE ||
die "Could not fetch updates from $REMOTE. Check your network connection."
- if different_refs $branch $REMOTE/$TRACK_BRANCH; then
+ mergebase=$($GIT merge-base $branch $REMOTE/$TRACK_BRANCH)
+ if different_refs $mergebase $REMOTE/$TRACK_BRANCH; then
stash_changes_if_needed
switch_to_tracking
Please sign in to comment.
Something went wrong with that request. Please try again.