From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Oct 2009 18:21:46 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc0~91
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea?ds=inline;hp=-c

Merge branch 'maint'

* maint:
help -a: do not unnecessarily look for a repository
Do not try to remove directories when removing old links
rebase -i: more graceful handling of invalid commands
help -i: properly error out if no info viewer can be found
---

cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea
diff --combined git-rebase--interactive.sh
index a1879e3ace,9b1e899e27..53ad248ee5
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -340,14 -340,6 +340,14 @@@ do_next () 
  		pick_one $sha1 ||
  			die_with_patch $sha1 "Could not apply $sha1... $rest"
  		;;
 +	reword|r)
 +		comment_for_reflog reword
 +
 +		mark_action_done
 +		pick_one $sha1 ||
 +			die_with_patch $sha1 "Could not apply $sha1... $rest"
 +		git commit --amend
 +		;;
  	edit|e)
  		comment_for_reflog edit
  
@@@ -416,7 -408,12 +416,12 @@@
  		;;
  	*)
  		warn "Unknown command: $command $sha1 $rest"
- 		die_with_patch $sha1 "Please fix this in the file $TODO."
+ 		if git rev-parse --verify -q "$sha1" >/dev/null
+ 		then
+ 			die_with_patch $sha1 "Please fix this in the file $TODO."
+ 		else
+ 			die "Please fix this in the file $TODO."
+ 		fi
  		;;
  	esac
  	test -s "$TODO" && return
@@@ -760,7 -757,6 +765,7 @@@ first and then run 'git rebase --contin
  #
  # Commands:
  #  p, pick = use commit
 +#  r, reword = use commit, but edit the commit message
  #  e, edit = use commit, but stop for amending
  #  s, squash = use commit, but meld into previous commit
  #