git/contrib/completion, branch v2.29.2

completion: complete refs after 'git restore -s'

2020-09-26T22:30:05Z

Currently only the long version (--source=) supports completion. Add completion support to the short (-s) option too. Signed-off-by: Ákos Uzonyi Signed-off-by: Junio C Hamano

completion: use "prev" variable instead of introducing "prevword"

2020-09-26T22:30:03Z

In both _git_checkout and _git_switch a new "prevword" variable were introduced, however the "prev" variable already contains the last word. The "prevword" variable is replaced with "prev", and the case is moved to the beginning of the function, like it's done in many other places (e.g. _git_commit). Also the indentaion of the case is fixed. Signed-off-by: Ákos Uzonyi Signed-off-by: Junio C Hamano

contrib/completion: complete options that take refs for format-patch

2020-09-17T22:23:22Z

The completion for format-patch currently suggests --base=, --interdiff= and --range-diff= as options. However, with these `=` forms of the options, there is no space and we'd enter the `--*` case which means we don't call the __git_complete_revlist() at the end. Teach _git_format_patch() to complete refs in the case of --base=, --interdiff= and --range-diff=. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

completion: add GIT_COMPLETION_SHOW_ALL env var

2020-08-20T00:46:17Z

When set to 1, GIT_COMPLETION_SHOW_ALL causes --git-completion-helper-all to be passed instead of --git-completion-helper. Signed-off-by: Ryan Zoeller Signed-off-by: Junio C Hamano

Merge branch 'pd/mergetool-nvimdiff'

2020-08-18T00:02:43Z

The existing backends for "git mergetool" based on variants of vim have been refactored and then support for "nvim" has been added. * pd/mergetool-nvimdiff: mergetools: add support for nvimdiff (neovim) family mergetool--lib: improve support for vimdiff-style tool variants

Merge branch 'mp/complete-show-color-moved'

2020-08-04T20:53:56Z

Command line completion (in contrib/) update. * mp/complete-show-color-moved: completion: add show --color-moved[-ws]

mergetools: add support for nvimdiff (neovim) family

2020-07-29T21:44:49Z

Signed-off-by: pudinha Signed-off-by: Junio C Hamano

Merge branch 'en/sparse-status' into master

2020-07-21T21:19:10Z

Fix to a "git prompt" regression during this development cycle. * en/sparse-status: git-prompt: change == to = for zsh's sake

git-prompt: change == to = for zsh's sake

2020-07-21T00:37:20Z

When using git-prompt.sh with zsh, __git_ps1 currently errs when inside a repo with: __git_ps1:96: = not found Avoid using non-portable "==" that is only understood by bash and not zsh. Change to "=" so that the prompt script becomes usable with zsh again. Signed-off-by: David J. Malan Signed-off-by: Junio C Hamano

completion: add show --color-moved[-ws]

2020-07-15T20:51:09Z

The completion for diff command was added in fd0bc175576 but missed the show command which also supports --color-moved[-ws]. This suffers from the very same problem [1] as the referenced commit: no comma-separated list completion for --color-moved-ws. [1]: https://github.com/scop/bash-completion/issues/240 Signed-off-by: Michal Privoznik Signed-off-by: Junio C Hamano