diff options
| author | Richard Quirk <richard.quirk@gmail.com> | 2008-04-27 15:35:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-28 04:38:22 (GMT) |
| commit | 07ba53f724b95a817f957b8e943c9e4f545a0949 (patch) | |
| tree | e2aff2295122b87eb5878adf173b0e9c016f1063 /contrib | |
| parent | 75ecfce39703e15a9f3d812faa4eb039935c8962 (diff) | |
| download | git-07ba53f724b95a817f957b8e943c9e4f545a0949.zip git-07ba53f724b95a817f957b8e943c9e4f545a0949.tar.gz git-07ba53f724b95a817f957b8e943c9e4f545a0949.tar.bz2 | |
bash: Add completion for gitk --merge
Option is only completed when .git/MERGE_HEAD is present.
Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | 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 665a895..23db664 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1346,9 +1346,14 @@ _git () _gitk () { local cur="${COMP_WORDS[COMP_CWORD]}" + local g="$(git rev-parse --git-dir 2>/dev/null)" + local merge="" + if [ -f $g/MERGE_HEAD ]; then + merge="--merge" + fi case "$cur" in --*) - __gitcomp "--not --all" + __gitcomp "--not --all $merge" return ;; esac |