Show also remote branches in git merge #103
Labels
Comments
|
This should be coming in the next release, probably within the next 2 weeks. |
chrisant996
added a commit
that referenced
this issue
Aug 15, 2022
|
Closing because it is fixed in the dev branch, and closing it helps me keep track of the remaining work for the next release (which will include the dev changes). |
chrisant996
added a commit
that referenced
this issue
Aug 20, 2022
* WIP [common] Adds basic wrapper for tables * WIP [common] Fixes tables wrapper to assign metatable correctly * WIP [common] Rework matchers using new table wrapper * Fix #103; show also remote branches in git merge. * Fix #117; .init.lua isn't loaded under some circumstances. The "." at the beginning of the ".init.lua" file name marks it as a hidden file in Linux and some sync programs. That can cause sync programs to not copy the file. Renaming to "!init.lua" resolves that problem, while still ensuring the script is loaded before any of the other completion scripts. * Fixing #117 requires a change in Cmder. So, for best compatibility, clink-completions will have both .init.lua and !init.lua files. * Explicitly add the completions directory. This enables newer Clink versions to load and use completions scripts on demand, even in Cmder (which manually loads clink-completions scripts, so Clink doesn't know about their script directory). * Fix #16; add curl completions. * Fix #145; add sudo argmatcher. Requires Clink v1.3.40 to work fully properly. * Rename to path_module so builtin path APIs are available. * Fix base git flags bleeding thru to commands. `git ls-files` doesn't have a linked argmatcher, so the `git` flags were bleeding into it. And etc for other commands. * Smarter completions for git add and git checkout. It's very unusual to add or checkout unchanged files. So `git add` uses `git status -uall` to generate file matches. And `git checkout` uses `git status -uno` to generate file matches. * Fix `hide=true` for linked argmatchers. * Fix #131; add winget completions. * Simplify help_parser unsupported short circuit. Return nothing, rather than returning an empty table. This makes it easier for a caller to recognize it's not supported. * matchers.ext_files improvements. - It uses new APIs when available. - It accepts a list of wildcards and adds them all at once, which makes adding directories much more efficient (only one time). * Add comments for some matchers module exports. * Add some common argmatchers. * Add robocopy argmatcher. * Some explicit version checks, just in case. * Add premake5 argmatcher. * Add msbuild argmatcher. * Add argmatchers for GNU grep and sed. * Better capitalization function in robocopy argmatcher. * Add adb/fastboot/scrcopy argmatchers. * Fix typo in winget complete position. * Fix #76; better display of yarn run completions. This colors the yarn run matches. In old Clink versions, it has no effect. * Fix `yarn` completions. While improving `yarn run` completions, `yarn` completions lost the `run` matches. Also, apply color to yarn local module matches, to differentiate them from yarn commands. * Clean luacheck warnings. * Fix typo in yarn run completions. * Fix some back-compat issues for v0.4.9. * Tell luacheck about another Clink API.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Now the git merge command auto complete with local branches instead of all branches. Will you consider change it to auto complete with all branches so that it behaves just like in bash environment? i.e. Changing from
"merge" .. parser({branches},to"merge" .. parser({local_or_remote_branches},ingit.lua.The text was updated successfully, but these errors were encountered: