From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Mar 2009 20:25:27 +0000 (-0700)
Subject: Merge branch 'maint-1.6.1' into maint
X-Git-Tag: v1.6.2.2~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b19293df9e84ed056bc984aa7ef716689b58b0b1;p=git.git

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  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.

Conflicts:
	contrib/completion/git-completion.bash
---

b19293df9e84ed056bc984aa7ef716689b58b0b1