Merge branch 'dl/stash-show-untracked'

"git stash show" learned to optionally show untracked part of the
stash.

* dl/stash-show-untracked:
  stash show: learn stash.showIncludeUntracked
  stash show: teach --include-untracked and --only-untracked
This commit is contained in:
Junio C Hamano
2021-03-22 14:00:24 -07:00
7 changed files with 214 additions and 9 deletions

View File

@ -3053,7 +3053,7 @@ _git_stash ()
__gitcomp "--name-status --oneline --patch-with-stat"
;;
show,--*)
__gitcomp "$__git_diff_common_options"
__gitcomp "--include-untracked --only-untracked $__git_diff_common_options"
;;
branch,--*)
;;