Reload most of Geany's configuration files without restarting, as menu item "Tools"->"Reload Configuration" or ```geany.reload_configuration()``` [from GeanyPy](https://geanypy.readthedocs.io/en/latest/api.html#geany.reload_configuration). You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany-plugins/pull/653
-- Commit Summary --
* GeanyLua: Add filetype to set in geany.newfile() * GeanyLua: Add function geany.reloadconf() (reload most of Geany's configuration files without restarting, as menu item Tools->Reload Configuration)
-- File Changes --
M geanylua/docs/geanylua-ref.html (45) M geanylua/glspi_app.c (36) M geanylua/glspi_doc.c (17)
-- Patch Links --
https://github.com/geany/geany-plugins/pull/653.patch https://github.com/geany/geany-plugins/pull/653.diff
Sorry, I used the wrong branch for cloning, I will fix it.
@Skif-off pushed 1 commit.
dca4cca GeanyLua: reload config.: Fixed mistake 1
@Skif-off pushed 1 commit.
28a253c GeanyLua: reload config.: Fixed mistake 2
@Skif-off pushed 1 commit.
2b17ade GeanyLua: reload config: Upd keywords.list
@Skif-off pushed 1 commit.
de2b99c GeanyLua: geanylua-ref.html: Fix "zebra" (class "odd"/"even") 2
@Skif-off would you mind to rebase and stash your branch based on recent git master?
@Skif-off pushed 1 commit.
6bf472b GeanyLua: sync from geany-plugins-git-master
@frlan done.
I wanted to correct something in the documentation (formatting only, more convenient to read + links for navigation): how much time do I have before the release 1.33?
No,. Please run git rebase master on your branch and make a force push to the branch.
@frlan Sorry, I'm a little confused :( Is now it happened? Otherwise it's easier for me to re-add PR.
Please don't abuse the bug tracker to avoid learning Git :)
I think what @frlan is asking is to squash the commits together into one, and to rebase it on master so it merges cleanly (@frlan correct me if I'm wrong).
Closed #653.
Reopened #653.
Sorry, maybe I am stupid, but I am doing my best :)
I don't know how to remove "Merge pull request #1 from geany/master" (synchronization with master). Is it possible?
@Skif-off yeah for git the console is better.
What I understand @frlan' is asking is for you to do a [git rebase](https://git-scm.com/docs/git-rebase) against the master branch to combine the two commits together and hopefully make the merge you did in your branch disappear (lesson: only ever pull Geany master into your master, not your branch).
`git rebase --interactive` makes it easier.
Big thanks to all of you, it seems, it's done.
But I have one problems: I did bad understand how I did it...
Much better ;) Thanks.
Merged #653.
github-comments@lists.geany.org