From b164a7b7158040e5ba5d2d210c2d8bb3abea9d27 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 20 Feb 2006 19:43:02 -0800 Subject: [PATCH] PU - --continue. --- Doit | 2 +- PU | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Doit b/Doit index a9f91a6e..520e0361 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 2a22632a..4b4be2ba 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=' ' -- 2.11.0