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.

Sign up for GitHub

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

Jump to bottom

just adding a vimplugin. #80368

Merged
merged 2 commits into from Feb 18, 2020
Merged

just adding a vimplugin. #80368

merged 2 commits into from Feb 18, 2020

Conversation

brettlyons
Copy link
Contributor

No description provided.

jonringer
jonringer reviewed Feb 17, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

otherwise LGTM

pkgs/misc/vim-plugins/generated.nix Show resolved Hide resolved
@jonringer
Copy link
Contributor

please clean up git history, should only have 2 commits

@brettlyons
Copy link
Contributor Author

please clean up git history, should only have 2 commits

How do I do that?

@jonringer
Copy link
Contributor

the "easiest" way would be be to pop off the commits and fix the message

git reset HEAD~2
git add pkgs/
git commit -m "vimPlugins.notational-fzf-vim: init at 2019-12-03"
git push .. .. --force

@brettlyons
Copy link
Contributor Author

I used git commit --amend "new msg" after resetting to head - 2, then force pushed. git log shows two commits, hash's ed8bfc9 and f4ac439. If it gets cleaner than that, let me know how.

jonringer
jonringer approved these changes Feb 18, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM
commits LGTM

[35 built, 0.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/80368
17 package built:
vimPlugins.airline vimPlugins.coc-git vimPlugins.denite vimPlugins.fugitive vimPlugins.neoterm vimPlugins.notational-fzf-vim vimPlugins.nvim-lsp vimPlugins.riv vimPlugins.vim-airline-themes vimPlugins.vim-localvimrc vimPlugins.vim-ps1 vimPlugins.vim-rooter vimPlugins.vim-slime vimPlugins.vim-test vimPlugins.vim-themis vimPlugins.vim-visual-multi vimPlugins.vimoutliner

@jonringer jonringer merged commit 0eb33b0 into NixOS:master Feb 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

Assignees
No one assigned
Labels
6.topic: vim 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 11-100 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@brettlyons @jonringer @Janik-Haag