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

Show zoom in status bar (use specifier %z). #2339

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

lpaulsen93
Copy link
Contributor

Replacement PR for PR #1697.

I re-applied the changes to the current master, re-tested and created this PR.

@kugel-
Copy link
Member

kugel- commented Oct 5, 2019

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

@lpaulsen93
Copy link
Contributor Author

@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)

@codebrainz
Copy link
Member

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.

Copy link
Member

@b4n b4n left a comment

Choose a reason for hiding this comment

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

You lost the documentation changes in the rebase.

I rebased myself and it gave me 2f0d622 that you can find on branch https://github.com/b4n/geany/commits/showzoom

@b4n
Copy link
Member

b4n commented Oct 6, 2019

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 :)

@elextr
Copy link
Member

elextr commented Oct 16, 2019

LGBI, not tested yet.

@lpaulsen93 lpaulsen93 requested a review from b4n October 16, 2019 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants