Skip to content

Commit bdff0e3

Browse files
committed
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
2 parents 908b360 + 5269f7f commit bdff0e3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

contrib/completion/git-completion.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ _git_difftool ()
12111211
return
12121212
;;
12131213
esac
1214-
__git_complete_file
1214+
__git_complete_revlist_file
12151215
}
12161216

12171217
__git_fetch_options="
@@ -2277,7 +2277,7 @@ _git_show ()
22772277
return
22782278
;;
22792279
esac
2280-
__git_complete_file
2280+
__git_complete_revlist_file
22812281
}
22822282

22832283
_git_show_branch ()

0 commit comments

Comments
 (0)