From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Apr 2008 02:17:51 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~148
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f?ds=inline;hp=-c

Merge branch 'maint'

* maint:
t7401: squelch garbage output
Documentation/git-submodule: typofix
Fix config key miscount in url.*.insteadOf
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
Document -w option to shortlog
bisect: report bad rev better
---

f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f
diff --combined git-bisect.sh
index ff904e60d9,5177a2a114..408775a51e
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@@ -1,9 -1,7 +1,9 @@@
  #!/bin/sh
  
 -USAGE='[start|bad|good|skip|next|reset|visualize|replay|log|run]'
 -LONG_USAGE='git bisect start [<bad> [<good>...]] [--] [<pathspec>...]
 +USAGE='[help|start|bad|good|skip|next|reset|visualize|replay|log|run]'
 +LONG_USAGE='git bisect help
 +        print this long help message.
 +git bisect start [<bad> [<good>...]] [--] [<pathspec>...]
          reset bisect state and start bisection.
  git bisect bad [<rev>]
          mark <rev> a known-bad revision.
@@@ -22,9 -20,7 +22,9 @@@ git bisect replay <logfile
  git bisect log
          show bisect log.
  git bisect run <cmd>...
 -        use <cmd>... to automatically bisect.'
 +        use <cmd>... to automatically bisect.
 +
 +Please use "git help bisect" to get the full man page.'
  
  OPTIONS_SPEC=
  . git-sh-setup
@@@ -159,9 -155,9 +159,9 @@@ bisect_state() 
  		shift
  		for rev in "$@"
  		do
- 			rev=$(git rev-parse --verify "$rev^{commit}") ||
+ 			sha=$(git rev-parse --verify "$rev^{commit}") ||
  				die "Bad rev input: $rev"
- 			bisect_write "$state" "$rev"
+ 			bisect_write "$state" "$sha"
  		done ;;
  	*,bad)
  		die "'git bisect bad' can take only one argument." ;;
@@@ -465,8 -461,6 +465,8 @@@ case "$#" i
      cmd="$1"
      shift
      case "$cmd" in
 +    help)
 +        git bisect -h ;;
      start)
          bisect_start "$@" ;;
      bad|good|skip)