index 6e5260ee7526975bf22b5031bd720a7a323bcf29..8431837f9705d9a940819db4fcd51283f433ba1a 100755 (executable)
__git_has_doubledash && return
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
--pretty=*)
__gitcomp "$__git_log_pretty_formats
--decorate
--walk-reflogs
--parents --children
- --merge
+ $merge
$__git_diff_common_options
--pickaxe-all --pickaxe-regex
"
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