Merge branch 'jk/clone-allow-bare-and-o-together' into maint-2.38

"git clone" did not like to see the "--bare" and the "--origin"
options used together without a good reason.

* jk/clone-allow-bare-and-o-together:
  clone: allow "--bare" with "-o"

diff --cc builtin/clone.c
Simple merge

diff --cc t/t5606-clone-options.sh
Simple merge