Merge branch 'em/checkout-orphan'

* em/checkout-orphan:
  log_ref_setup: don't return stack-allocated array
  bash completion: add --orphan to 'git checkout'
  t3200: test -l with core.logAllRefUpdates options
  checkout --orphan: respect -l option always
  refs: split log_ref_write logic into log_ref_setup
  Documentation: alter checkout --orphan description
This commit is contained in:
Junio C Hamano
2010-06-21 06:02:41 -07:00
7 changed files with 180 additions and 72 deletions

View File

@ -842,7 +842,7 @@ _git_checkout ()
--*)
__gitcomp "
--quiet --ours --theirs --track --no-track --merge
--conflict= --patch
--conflict= --orphan --patch
"
;;
*)