diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-30 13:23:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-30 13:23:53 -0700 |
| commit | dcbf0417453297207c7e61efbf1f38621b1caa3f (patch) | |
| tree | f988ff10dc493f562ead94f1110ff1162db0c268 | |
| parent | 8e4f767ba77051aedaac7ef6639ee990778866c7 (diff) | |
| parent | ba7906f2f4c332f814d270d2e16b0010516fc53e (diff) | |
| download | git-dcbf0417453297207c7e61efbf1f38621b1caa3f.tar.gz git-dcbf0417453297207c7e61efbf1f38621b1caa3f.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
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/git-tag.txt | 1 | ||||
| -rw-r--r-- | Documentation/technical/api-history-graph.txt | 8 | ||||
| -rwxr-xr-x | contrib/completion/git-completion.bash | 9 |
3 files changed, 12 insertions, 6 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index e44f54302..3546acffb 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 e00454983..3889cfb5a 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -935,6 +935,11 @@ _git_log () __git_has_doubledash && return local cur="${COMP_WORDS[COMP_CWORD]}" + local g="$(git rev-parse --git-dir 2>/dev/null)" + local merge="" + if [ -f "$g/MERGE_HEAD" ]; then + merge="--merge" + fi case "$cur" in --pretty=*) __gitcomp " @@ -966,7 +971,7 @@ _git_log () --decorate --diff-filter= --color-words --walk-reflogs --parents --children --full-history - --merge + $merge " return ;; @@ -1751,7 +1756,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 |