diff --git a/Doit b/Doit index a9f91a6e9c..520e03616c 100755 --- a/Doit +++ b/Doit @@ -1,6 +1,6 @@ #!/bin/sh -J='-l 1.5 -j' +J= test -z "$(git diff --cached --name-status)" || { echo >&2 "Repository unclean." diff --git a/PU b/PU index 2a22632a82..4b4be2ba42 100755 --- a/PU +++ b/PU @@ -9,8 +9,15 @@ case "$(git-diff-index --name-status HEAD)" in *) echo 2>&1 "Local modifications exist." exit 1;; esac -git checkout pu && -git reset --hard master && + +case "$1" in +--continue) + shift + ;; +*) + git checkout pu && + git reset --hard master || exit +esac ORIG_HEAD=`git rev-parse ORIG_HEAD` || exit LF=' '