summaryrefslogtreecommitdiff
path: root/contrib/completion/git-completion.bash
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 06:02:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 06:02:41 -0700
commit5bebcd4ecba0791cecaa49d30ddd7ca8ffe03627 (patch)
treea45f037dd501845eabe6f66bda45547ca63a3c9d /contrib/completion/git-completion.bash
parentDrop items that are 1.7.1.1 fixes from the 1.7.1 release notes (diff)
parentlog_ref_setup: don't return stack-allocated array (diff)
downloadtgif-5bebcd4ecba0791cecaa49d30ddd7ca8ffe03627.tar.xz
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
Diffstat (limited to 'contrib/completion/git-completion.bash')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 57245a8c01..aebb0b6890 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -842,7 +842,7 @@ _git_checkout ()
--*)
__gitcomp "
--quiet --ours --theirs --track --no-track --merge
- --conflict= --patch
+ --conflict= --orphan --patch
"
;;
*)