From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2011 21:31:38 +0000 (-0700)
Subject: Merge branch 'js/rebase-typo-branch-squelch-usage'
X-Git-Tag: v1.7.7-rc0~95
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/55272570dbe1c3f2a6f2f142c4bfe806665cd111?ds=inline;hp=-c

Merge branch 'js/rebase-typo-branch-squelch-usage'

* js/rebase-typo-branch-squelch-usage:
rebase: do not print lots of usage hints after an obvious error message
---

55272570dbe1c3f2a6f2f142c4bfe806665cd111
diff --combined git-rebase.sh
index d7855ea1c6,2075ccf787..4761f28890
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -153,9 -153,7 +153,9 @@@ move_to_original_branch () 
  		message="rebase finished: $head_name onto $onto"
  		git update-ref -m "$message" \
  			$head_name $(git rev-parse HEAD) $orig_head &&
 -		git symbolic-ref HEAD $head_name ||
 +		git symbolic-ref \
 +			-m "rebase finished: returning to $head_name" \
 +			HEAD $head_name ||
  		die "Could not move back to $head_name"
  		;;
  	esac
@@@ -334,7 -332,7 +334,7 @@@ abort
  	read_basic_state
  	case "$head_name" in
  	refs/*)
 -		git symbolic-ref HEAD $head_name ||
 +		git symbolic-ref -m "rebase: aborting" HEAD $head_name ||
  		die "Could not move back to $head_name"
  		;;
  	esac
@@@ -441,8 -439,7 +441,7 @@@ case "$#" i
  	then
  		head_name="detached HEAD"
  	else
- 		echo >&2 "fatal: no such branch: $1"
- 		usage
+ 		die "fatal: no such branch: $1"
  	fi
  	;;
  *)