Merge branch 'rr/complete-difftool-fixup'

"git difftool" can take both revs to be compared and pathspecs.
"git show" takes revs, revs:path and pathspecs.

* rr/complete-difftool-fixup:
  completion: show can take both revlist and paths
  completion: difftool takes both revs and files
This commit is contained in:
Junio C Hamano 2013-06-14 08:46:23 -07:00
Родитель 908b3601e6 5269f7f8c6
Коммит bdff0e3a37
1 изменённых файлов: 2 добавлений и 2 удалений

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

@ -1211,7 +1211,7 @@ _git_difftool ()
return
;;
esac
__git_complete_file
__git_complete_revlist_file
}
__git_fetch_options="
@ -2277,7 +2277,7 @@ _git_show ()
return
;;
esac
__git_complete_file
__git_complete_revlist_file
}
_git_show_branch ()