Merge branch 'dk/help-all'

"git cmd --help-all" now works outside repositories.

* dk/help-all:
  builtin: also setup gently for --help-all
  parse-options: refactor flags for usage_with_options_internal

diff --cc git.c
Simple merge

diff --cc parse-options.c
Simple merge

diff --cc t/t1517-outside-repo.sh
index 5ce0ceb1769a28058e7e31f323b11312a32165f7,e34321dd446abfcbcfc7bb827ac90bf99b54f775..1c69d52c76eb48f39d092817ae756498dd8b17a2
--- 1/t/t1517-outside-repo.sh
--- 2/t/t1517-outside-repo.sh
+++ b/t/t1517-outside-repo.sh
@@@ -133,13 -133,10 +133,17 @@@ d
                test_expect_code 129 nongit git $cmd -h >usage &&
                test_grep "[Uu]sage: git $cmd " usage
        '
+       test_$expect_outcome $prereq "'git $cmd --help-all' outside a repository" '
+               test_expect_code 129 nongit git $cmd --help-all >usage &&
+               test_grep "[Uu]sage: git $cmd " usage
+       '
  done
  
 +test_expect_success 'fmt-merge-msg does not crash with -h' '
 +      test_expect_code 129 git fmt-merge-msg -h >usage &&
 +      test_grep "[Uu]sage: git fmt-merge-msg " usage &&
 +      test_expect_code 129 nongit git fmt-merge-msg -h >usage &&
 +      test_grep "[Uu]sage: git fmt-merge-msg " usage
 +'
 +
  test_done