aboutsummaryrefslogtreecommitdiff
path: root/contrib/completion/git-completion.bash
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-30 13:29:57 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-30 13:29:57 -0700
commit442dd42d6d4903640b0dc5561481a77c88dcea90 (patch)
treeee755ba591e8d3e81941e0dc3dd80420dfde0790 /contrib/completion/git-completion.bash
parent01eadafccbeae485503f5373dc60cc5a04877c3b (diff)
parent8c7f78823888306c1cceafcf5fd26739eef99ce3 (diff)
downloadgit-442dd42d6d4903640b0dc5561481a77c88dcea90.tar.gz
git-442dd42d6d4903640b0dc5561481a77c88dcea90.tar.xz
Merge branch 'maint'
* maint: Update draft release notes to 1.6.2.2 Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example.
Diffstat (limited to 'contrib/completion/git-completion.bash')
-rwxr-xr-xcontrib/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 1c6b0e28e..e72ce2428 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1103,7 +1103,7 @@ _git_log ()
local cur="${COMP_WORDS[COMP_CWORD]}"
local g="$(git rev-parse --git-dir 2>/dev/null)"
local merge=""
- if [ -f $g/MERGE_HEAD ]; then
+ if [ -f "$g/MERGE_HEAD" ]; then
merge="--merge"
fi
case "$cur" in
@@ -1943,7 +1943,7 @@ _gitk ()
local cur="${COMP_WORDS[COMP_CWORD]}"
local g="$(__gitdir)"
local merge=""
- if [ -f $g/MERGE_HEAD ]; then
+ if [ -f "$g/MERGE_HEAD" ]; then
merge="--merge"
fi
case "$cur" in