Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] Docs for git-checkout-script.
[gitweb.git]
/
git-checkout-script
diff --git
a/git-checkout-script
b/git-checkout-script
index a37740713ed747a18b7ee5415e41e5bd57834c48..b31ded716d470a4975512ebc4cb912b3adb5fb7f 100755
(executable)
--- a/
git-checkout-script
+++ b/
git-checkout-script
@@
-37,7
+37,6
@@
while [ "$#" != "0" ]; do
fi
;;
esac
- i=$(($i+1))
done
[ -z "$new" ] && new=$old
@@
-72,4
+71,6
@@
if [ "$?" -eq 0 ]; then
fi
[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
rm -f "$GIT_DIR/MERGE_HEAD"
+else
+ exit 1
fi