From cc120056a881101326488e3c5c2d3af2ce3a8de6 Mon Sep 17 00:00:00 2001 From: Sean Date: Sat, 13 May 2006 23:34:08 -0400 Subject: Make git rebase interactive help match documentation. Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano --- git-am.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'git-am.sh') diff --git a/git-am.sh b/git-am.sh index 507ae4dcb..33f208cb0 100755 --- a/git-am.sh +++ b/git-am.sh @@ -15,6 +15,10 @@ stop_here () { } stop_here_user_resolve () { + if [ -n "$resolvemsg" ]; then + echo "$resolvemsg" + stop_here $1 + fi cmdline=$(basename $0) if test '' != "$interactive" then @@ -121,7 +125,7 @@ fall_back_3way () { } prec=4 -dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= +dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg= while case "$#" in 0) break;; esac do @@ -157,6 +161,9 @@ do --whitespace=*) ws=$1; shift ;; + --resolvemsg=*) + resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;; + --) shift; break ;; -*) @@ -185,7 +192,7 @@ then else # Make sure we are not given --skip nor --resolved test ",$skip,$resolved," = ,,, || - die "we are not resuming." + die "Resolve operation not in progress, we are not resuming." # Start afresh. mkdir -p "$dotest" || exit -- cgit v1.2.1