Fix case.

[git-central.git] / scripts / pull

diff --git a/scripts/pull b/scripts/pull
index c2313ba..f2b149b 100644 (file)
--- a/scripts/pull
+++ b/scripts/pull
@@ -2,7 +2,7 @@
 
 branch_name=$(git symbolic-ref --quiet HEAD)
 if [[ $? -ne 0 ]] ; then
-       echo "not on a branch"
+       echo "Not on a branch"
        exit 1
 fi
 
@@ -13,5 +13,9 @@ if [[ $? -ne 0 ]] ; then
        exit $?
 fi
 
-GIT_EDITOR=: git rebase -p -i "origin/$branch_name"
+if test $(git rev-parse HEAD) = $(git merge-base HEAD origin/$branch_name) ; then
+       git rebase "origin/$branch_name"
+else
+       GIT_EDITOR=: git rebase -p -i "origin/$branch_name"
+fi