Merge branch 'tb/complete-checkout'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Nov 2017 05:24:31 +0000 (14:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Nov 2017 05:24:31 +0000 (14:24 +0900)
Command line completion (in contrib/) update.

* tb/complete-checkout:
completion: add remaining flags to checkout

1  2 
contrib/completion/git-completion.bash
index fcd83311a36191d7a540c411ce99f02fda57c1b3,539d7f84f3d84adb6d3cbb3301dcbb749033b610..fdd984d34a9240de115edc2e8dee37302574f1c6
@@@ -1250,7 -1250,8 +1250,8 @@@ _git_checkout (
        --*)
                __gitcomp "
                        --quiet --ours --theirs --track --no-track --merge
-                       --conflict= --orphan --patch
+                       --conflict= --orphan --patch --detach --ignore-skip-worktree-bits
+                       --recurse-submodules --no-recurse-submodules
                        "
                ;;
        *)
@@@ -2350,7 -2351,6 +2351,7 @@@ _git_config (
                advice.rmHints
                advice.statusHints
                advice.statusUoption
 +              advice.ignoredHook
                alias.
                am.keepcr
                am.threeWay