Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git mergetool completion #3226

Merged
merged 2 commits into from Jul 15, 2016
Merged

Git mergetool completion #3226

merged 2 commits into from Jul 15, 2016

Conversation

@gladhorn
Copy link
Contributor

gladhorn commented Jul 13, 2016

auto complete "git mergetool" (optionally with --tool= and unmerged files)

function __fish_git_mergetools
set -l tools diffuse diffmerge ecmerge emerge kdiff3 meld opendiff tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
for tool in $tools
command --search $tool >/dev/null; and begin

This comment has been minimized.

Copy link
@faho

faho Jul 14, 2016

Member

Since you are doing begin/end anyway, this would be nicer with if command.

This comment has been minimized.

Copy link
@gladhorn

gladhorn Jul 15, 2016

Author Contributor

Thanks, I agree :)

gladhorn added 2 commits Jul 13, 2016
The list of tools is stole from the bash completion file that comes with
git.
@gladhorn gladhorn force-pushed the gladhorn:git_mergetool branch from 9db410e to 7950066 Jul 15, 2016
@faho faho merged commit 6b99af0 into fish-shell:master Jul 15, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@faho
Copy link
Member

faho commented Jul 15, 2016

Merged, thanks!

@faho faho added this to the next-2.x milestone Jul 15, 2016
@krader1961 krader1961 modified the milestones: fish 2.4.0, next-2.x Sep 3, 2016
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 17, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.