From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Mar 2009 20:29:57 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc0~62
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=442dd42d6d4903640b0dc5561481a77c88dcea90;p=git-core%2Fgit.git

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.
---

442dd42d6d4903640b0dc5561481a77c88dcea90
diff --cc contrib/completion/git-completion.bash
index 1c6b0e28e,8431837f9..e72ce2428
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1941,9 -1841,9 +1941,9 @@@ _gitk (
  	__git_has_doubledash && return
  
  	local cur="${COMP_WORDS[COMP_CWORD]}"
 -	local g="$(git rev-parse --git-dir 2>/dev/null)"
 +	local g="$(__gitdir)"
  	local merge=""
- 	if [ -f $g/MERGE_HEAD ]; then
+ 	if [ -f "$g/MERGE_HEAD" ]; then
  		merge="--merge"
  	fi
  	case "$cur" in