Merge branch 'maint-1.6.4' into maint
commitaab748636dbbd6412af6f4996c2791eba4246c0c
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Oct 2009 07:03:24 +0000 (28 00:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Oct 2009 07:03:24 +0000 (28 00:03 -0700)
treec80f0114021a14cd0263a98c2687cc8261e5dff1
parentade2ca0ca9f8335be300d5538e1ca9cb3594ae64
parentf1be316ada93158507c315ee7948bb9e6007eb91
Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
  rebase -i: more graceful handling of invalid commands
  help -i: properly error out if no info viewer can be found