mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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.
This commit is contained in:
Junio C Hamano 2009-03-30 13:29:57 -07:00
commit 442dd42d6d
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/RelNotes-1.6.2.2.txt
View File

@ -27,9 +27,16 @@ Fixes since v1.6.2.1
* 'git-submodule add' did not tolerate extra slashes and ./ in the path it * 'git-submodule add' did not tolerate extra slashes and ./ in the path it
accepted from the command line; it now is more lenient. accepted from the command line; it now is more lenient.
* git-svn misbehaved when the project contained a path that began with
two dashes.
* import-zips script (in contrib) did not compute the common directory
prefix correctly.
Many small documentation updates are included as well.
--- ---
exec >/var/tmp/1 exec >/var/tmp/1
O=v1.6.2.1-23-g67c176f O=v1.6.2.1-46-gb19293d
echo O=$(git describe maint) echo O=$(git describe maint)
git shortlog --no-merges $O..maint git shortlog --no-merges $O..maint

1
Documentation/git-tag.txt
View File

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

8
Documentation/technical/api-history-graph.txt
View File

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

4
contrib/completion/git-completion.bash
View File

@ -1103,7 +1103,7 @@ _git_log ()
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
local g="$(git rev-parse --git-dir 2>/dev/null)" local g="$(git rev-parse --git-dir 2>/dev/null)"
local merge="" local merge=""
if [ -f $g/MERGE_HEAD ]; then if [ -f "$g/MERGE_HEAD" ]; then
merge="--merge" merge="--merge"
fi fi
case "$cur" in case "$cur" in
@ -1943,7 +1943,7 @@ _gitk ()
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
local g="$(__gitdir)" local g="$(__gitdir)"
local merge="" local merge=""
if [ -f $g/MERGE_HEAD ]; then if [ -f "$g/MERGE_HEAD" ]; then
merge="--merge" merge="--merge"
fi fi
case "$cur" in case "$cur" in