Fix default pull not to do an unintended Octopus.

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index e3d1196..67c7f95 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -24,7 +24,9 @@ then
                die "You need to first update your working tree."
 fi
 
-merge_head=$(sed -e 's/        .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
+merge_head=$(sed -e '/ not-for-merge   /d' \
+       -e 's/  .*//' "$GIT_DIR"/FETCH_HEAD | \
+       tr '\012' ' ')
 
 case "$merge_head" in
 '')