diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-10 04:08:18 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-12 10:43:20 -0700 |
| commit | 7655fa7fa9f58503f21e2354f4a12fd949efa712 (patch) | |
| tree | 2ac572fed68cd8abdd5c150e675c22cd0b49b3c5 | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-7655fa7fa9f58503f21e2354f4a12fd949efa712.tar.xz | |
completion: add more cherry-pick options
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | contrib/completion/git-completion.bash | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 2ba1461422..8ad842e462 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1124,9 +1124,14 @@ _git_cherry () _git_cherry_pick () { + local dir="$(__gitdir)" + if [ -f "$dir"/CHERRY_PICK_HEAD ]; then + __gitcomp "--continue --quit --abort" + return + fi case "$cur" in --*) - __gitcomp "--edit --no-commit" + __gitcomp "--edit --no-commit --signoff --strategy= --mainline" ;; *) __gitcomp_nl "$(__git_refs)" |