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
This commit is contained in:
Junio C Hamano
2009-03-30 13:25:27 -07:00
3 changed files with 7 additions and 6 deletions

View File

@ -148,22 +148,22 @@ outputting that information, if desired.
------------
*
*
M
*
|\
* |
| | *
| \ \
| \ \
M-. \ \
*-. \ \
|\ \ \ \
| | * | |
| | | | | *
| | | | | *
| | | | | M
| | | | | *
| | | | | |\
| | | | | | *
| * | | | | |
| | | | | M \
| | | | | * \
| | | | | |\ |
| | | | * | | |
| | | | * | | |