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

diff --cc git-rebase--interactive.sh
Simple merge