Code

Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 20:25:27 +0000 (13:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 20:25:27 +0000 (13:25 -0700)
commitb19293df9e84ed056bc984aa7ef716689b58b0b1
tree4c7eeda9e1f66f31cd30a89c48848195cdd4517e
parent510a309e5e0997c73d97c85332a99d622f06ace6
parentdcbf0417453297207c7e61efbf1f38621b1caa3f
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
Documentation/git-tag.txt
contrib/completion/git-completion.bash