summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-09-25 06:27:44 (GMT)
committerJonathan Nieder <jrnieder@gmail.com>2013-09-25 06:27:44 (GMT)
commitb7f571618cdec4fee19a06576ea40859b7398c69 (patch)
tree3c261d259527a8f65af859ec982f8d98278a5ee4 /contrib
parent40b77322d2bffc7d513d1540ae127a08e84aadcb (diff)
parentea95c7b8f52471f7ce30379c2b2d7032f2b8c2c9 (diff)
downloadgit-b7f571618cdec4fee19a06576ea40859b7398c69.zip
git-b7f571618cdec4fee19a06576ea40859b7398c69.tar.gz
git-b7f571618cdec4fee19a06576ea40859b7398c69.tar.bz2
Merge branch 'sg/complete-untracked-filter'
* sg/complete-untracked-filter: completion: improve untracked directory filtering for filename completion
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e1b7313..86f7734 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -901,7 +901,7 @@ _git_add ()
esac
# XXX should we check for --update and --all options ?
- __git_complete_index_file "--others --modified"
+ __git_complete_index_file "--others --modified --directory --no-empty-directory"
}
_git_archive ()
@@ -1063,7 +1063,7 @@ _git_clean ()
esac
# XXX should we check for -x option ?
- __git_complete_index_file "--others"
+ __git_complete_index_file "--others --directory"
}
_git_clone ()