Replacement PR for PR #1697.
I re-applied the changes to the current master, re-tested and created this PR. You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/2339
-- Commit Summary --
* Show zoom in status bar (use specifier %z).
-- File Changes --
M src/editor.c (1) M src/sciwrappers.c (10) M src/sciwrappers.h (3) M src/ui_utils.c (16)
-- Patch Links --
https://github.com/geany/geany/pull/2339.patch https://github.com/geany/geany/pull/2339.diff
Why?? Please dont open a new PR unless there is a very good reason. You can always force push to completely replace the diff of the original PR
@kugel-: I did something wrong on rebasing/squashing the original PR and so the commit history was completely messed up. From there I did not know how to get back to a clean history. (I usually squash without problems and do not create new PRs without reason)
From there I did not know how to get back to a clean history.
Depending what you did, one of these would probably help:
* `git rebase --abort` if you messed up rebase. * `git merge --abort` if you messed up a merge. * `git reset --hard <commit spec>` to go back to a specific commit.
b4n requested changes on this pull request.
You lost the documentation changes in the rebase.
I rebased myself and it gave me 2f0d6220d36cf2a533b78010bd6071e6bdcf6944 that you can find on branch https://github.com/b4n/geany/commits/showzoom
Ideally you'd push again to the original `showzoom` branch so that we have the canonical PR as @codebrainz said, but I'm OK either way so long as we get the wonderful docs back :)
@LarsGit223 pushed 1 commit.
c7113a70234c78267209cbb43cafb429d50ec947 added missing docs
LGBI, not tested yet.
github-comments@lists.geany.org