remove ARM and Mozilla SHA1 implementations

diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 03bdea686321be4785ba9d4fe0de3fe92449fdab..3510a86e38d2821880060d4faa554c016a9f95e2 100644 (file)
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -665,7 +665,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                OPT_BOOLEAN(0, "sha1-name", &sha1_name,
                            "name commits with their object names"),
                OPT_BOOLEAN(0, "merge-base", &merge_base,
-                           "act like git merge-base -a"),
+                           "show possible merge bases"),
                OPT_BOOLEAN(0, "independent", &independent,
                            "show refs unreachable from any other ref"),
                OPT_BOOLEAN(0, "topo-order", &lifo,