The `--branches` option will work with how git works today. If my patch gets in, future versions of Git will be better with `--all`.