diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-30 20:25:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-30 20:25:27 (GMT) |
| commit | b19293df9e84ed056bc984aa7ef716689b58b0b1 (patch) | |
| tree | 4c7eeda9e1f66f31cd30a89c48848195cdd4517e /contrib | |
| parent | 510a309e5e0997c73d97c85332a99d622f06ace6 (diff) | |
| parent | dcbf0417453297207c7e61efbf1f38621b1caa3f (diff) | |
| download | git-b19293df9e84ed056bc984aa7ef716689b58b0b1.zip git-b19293df9e84ed056bc984aa7ef716689b58b0b1.tar.gz git-b19293df9e84ed056bc984aa7ef716689b58b0b1.tar.bz2 | |
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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0a3092f..8431837 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 |