Skip to content

Conversation

md9753
Copy link

@md9753 md9753 commented Jun 28, 2025

Addresses #831

Several archive formats have commonly-used aliases for storing comic books. This PR adds those aliases for the formats Ouch already supports:

  • tar: .cbt
  • zip: .cbz
  • 7z: .cb7
  • rar: .cbr

Screenshot_20250628_112935

I'm very new to Rust, so a close eye when looking this over would be appreciated.

md9753 added 3 commits June 23, 2025 17:26
Added .cbt, .cbz, .cb7, and .cbr aliases for .tar, .zip, .7z, and .rar,
respectively.
Fixed formatting in SUPPORTED_ALIASES
Added aliases to PRETTY_SUPPORTED_ALIASES
Updated snapshots to reflect changes to alias list, changed wording in
README, removed changes to changelog per contributing.md

to be squashed
@md9753 md9753 closed this Jun 28, 2025
@md9753
Copy link
Author

md9753 commented Jun 28, 2025

I'm still learning about git -- looks like this is keeping the individual commit names on my branch? I was under the impression github squashed everything. I'll reopen this after renaming the commits to be more informative

@marcospb19
Copy link
Member

marcospb19 commented Jul 2, 2025

I'm still learning about git -- looks like this is keeping the individual commit names on my branch? I was under the impression github squashed everything. I'll reopen this after renaming the commits to be more informative

hah no problem :)

You could either leave it so that I squash when merging, on my side, or you can run an interactive rebase locally that will squash all the commits before you push. Different projects demand different things, but I usually do this.

And if you forget to squash locally, but want the same effect, you can rebase locally and then push with "force" to correct the commit history, not ideal but pretty OK and common when there is 1 person working on a PR alone.

@md9753
Copy link
Author

md9753 commented Jul 3, 2025

I was reading some tutorials and came across that last "not ideal" method, so I squashed everything locally and force-pushed to the fork I made. Then I couldn't edit this PR to reflect those changes, so after reading more and still not being able to fix it, I opened #835.

I don't know if I should try to fix this PR since #835 exists. Rather than making another assumption, let me know how to proceed and I'll do my best to make it happen.

@marcospb19
Copy link
Member

We can keep this one closed, I prefer to review the other one yeah :)

@marcospb19
Copy link
Member

I squashed everything locally and force-pushed to the fork I made. Then I couldn't edit this PR to reflect those changes

That should've worked!! weird, maybe you force-pushed to the wrong branch or something like that

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.

2 participants