Skip to content

Commit actual code in Git, not outdated archive#50

Open
Roy-Orbison wants to merge 1 commit intoopto:masterfrom
Roy-Orbison:actual-code
Open

Commit actual code in Git, not outdated archive#50
Roy-Orbison wants to merge 1 commit intoopto:masterfrom
Roy-Orbison:actual-code

Conversation

@Roy-Orbison
Copy link
Copy Markdown

Extracted release v3.4.4, merged and tidied README content, set consistent line-endings, deleted old .xpi file, added .gitignore and a GNU makefile so releases can be built using only the make command.

A single zip file is a bit opaque, and not conducive to code review, issues, or pull requests.

Extracted release v3.4.4, merged and tidied README content, set
consistent line-endings, deleted old .xpi file, added .gitignore and a
GNU makefile so releases can be built using only the `make` command.
@riedel
Copy link
Copy Markdown

riedel commented Sep 24, 2022

The author should of the commit should be linked correctly, IMHO. The PR IMHO should also be rebased on: https://github.com/wangvisual/expression-search . If this is done it should be done correctly I guess.

@opto
Copy link
Copy Markdown
Owner

opto commented Sep 24, 2022

the problem is, I have it spread over three repos, historically, and have not figured out yet how to combine that in a linear commit flow. Google gave a lot of getting commits from parallel repos into subtrees, but that is not what I really wanted.

Klaus

@riedel
Copy link
Copy Markdown

riedel commented Sep 25, 2022

I just quickly created #51 to show that it is principally possible. Actually this is the better one but I cannot do a PR because this repo is not fork of wangvisuals: https://github.com/riedel/expression-search/tree/expression-search-NG

What I did is that I only unpacked the xpi on top of the latest changes I got on top of the original expression search (did that before with the TB68 version). I took the timestamps for the files and put you as an author.

@riedel
Copy link
Copy Markdown

riedel commented Sep 25, 2022

the problem is, I have it spread over three repos, historically, and have not figured out yet how to combine that in a linear commit flow. Google gave a lot of getting commits from parallel repos into subtrees, but that is not what I really wanted.

Klaus

If you have another internal repo with "better" commit messages, what you can simply do is a git rebase -i original_repo/master (and add possibly add the original repo as remote first and do a fetch). It will reapply you changes on top of the other repo.
Hope it helps

@Roy-Orbison
Copy link
Copy Markdown
Author

@opto Would you consider publishing those other repos, possibly only temporarily, so we can suggest a better solution?

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.

3 participants