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
Родитель 510a309e5e dcbf041745
Коммит b19293df9e
3 изменённых файлов: 7 добавлений и 6 удалений

Просмотреть файл

@ -63,6 +63,7 @@ OPTIONS
are printed when using -l.
The default is not to print any annotation lines.
If no number is given to `-n`, only the first line is printed.
If the tag is not annotated, the commit message is displayed instead.
-l <pattern>::
List tags with names that match the given pattern (or all if no pattern is given).

Просмотреть файл

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

Просмотреть файл

@ -1005,7 +1005,7 @@ _git_log ()
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
@ -1843,7 +1843,7 @@ _gitk ()
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