diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-30 13:29:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-30 13:29:57 -0700 |
| commit | 442dd42d6d4903640b0dc5561481a77c88dcea90 (patch) | |
| tree | ee755ba591e8d3e81941e0dc3dd80420dfde0790 | |
| parent | 01eadafccbeae485503f5373dc60cc5a04877c3b (diff) | |
| parent | 8c7f78823888306c1cceafcf5fd26739eef99ce3 (diff) | |
| download | git-442dd42d6d4903640b0dc5561481a77c88dcea90.tar.gz git-442dd42d6d4903640b0dc5561481a77c88dcea90.tar.xz | |
Merge branch 'maint'
* 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.
| -rw-r--r-- | Documentation/RelNotes-1.6.2.2.txt | 9 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 1 | ||||
| -rw-r--r-- | Documentation/technical/api-history-graph.txt | 8 | ||||
| -rwxr-xr-x | contrib/completion/git-completion.bash | 4 |
4 files changed, 15 insertions, 7 deletions
diff --git a/Documentation/RelNotes-1.6.2.2.txt b/Documentation/RelNotes-1.6.2.2.txt index 28bfa5399..4f4c47341 100644 --- a/Documentation/RelNotes-1.6.2.2.txt +++ b/Documentation/RelNotes-1.6.2.2.txt @@ -27,9 +27,16 @@ Fixes since v1.6.2.1 * 'git-submodule add' did not tolerate extra slashes and ./ in the path it 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 -O=v1.6.2.1-23-g67c176f +O=v1.6.2.1-46-gb19293d echo O=$(git describe maint) git shortlog --no-merges $O..maint diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 533d18bbd..fa733214a 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -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). diff --git a/Documentation/technical/api-history-graph.txt b/Documentation/technical/api-history-graph.txt index e9559790a..d66e61b1e 100644 --- a/Documentation/technical/api-history-graph.txt +++ b/Documentation/technical/api-history-graph.txt @@ -148,22 +148,22 @@ outputting that information, if desired. ------------ * * -M +* |\ * | | | * | \ \ | \ \ -M-. \ \ +*-. \ \ |\ \ \ \ | | * | | | | | | | * | | | | | * -| | | | | M +| | | | | * | | | | | |\ | | | | | | * | * | | | | | -| | | | | M \ +| | | | | * \ | | | | | |\ | | | | | * | | | | | | | * | | | diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 1c6b0e28e..e72ce2428 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1103,7 +1103,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 @@ -1943,7 +1943,7 @@ _gitk () local cur="${COMP_WORDS[COMP_CWORD]}" local g="$(__gitdir)" local merge="" - if [ -f $g/MERGE_HEAD ]; then + if [ -f "$g/MERGE_HEAD" ]; then merge="--merge" fi case "$cur" in |