Skip to content

Commit

Permalink
Merge branch 'rr/complete-difftool-fixup'
Browse files Browse the repository at this point in the history
"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
  • Loading branch information
Junio C Hamano committed Jun 14, 2013
2 parents 908b360 + 5269f7f commit bdff0e3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/completion/git-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,7 @@ _git_difftool ()
return
;;
esac
__git_complete_file
__git_complete_revlist_file
}

__git_fetch_options="
Expand Down Expand Up @@ -2277,7 +2277,7 @@ _git_show ()
return
;;
esac
__git_complete_file
__git_complete_revlist_file
}

_git_show_branch ()
Expand Down

0 comments on commit bdff0e3

Please sign in to comment.