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

Separate gitconfig sections with a newline #11

Merged
merged 5 commits into from
Jul 3, 2024
Merged

Separate gitconfig sections with a newline #11

merged 5 commits into from
Jul 3, 2024

Conversation

injust
Copy link
Contributor

@injust injust commented Jul 2, 2024

Edited by hand and didn't build to test.

@injust injust mentioned this pull request Jul 2, 2024
@uncenter
Copy link
Member

uncenter commented Jul 2, 2024

As I have just opened a Whiskers PR you should probably wait until it is merged before making these changes. The diff is annoying to resolve and if my pull request is merged first you will have to redo this anyway.

@injust
Copy link
Contributor Author

injust commented Jul 2, 2024

Just wanted to make sure it's tracked somewhere, I can rebase once #8 is merged.

edit: Okay yeah I see what you mean 😅 I didn't expect it to get merged that quickly!

@uncenter
Copy link
Member

uncenter commented Jul 2, 2024

When "rebasing" please make sure your changes to the template actually result in the changes you wrote by hand in the output files. You can do this by building the themes with Whiskers, installation instructions available at https://github.com/catppuccin/whiskers#installation. Once you have it installed you can use whiskers delta.tera or just build if you have the just command runner installed.

@Anomalocaridid
Copy link
Collaborator

Like @uncenter said, could you please build the theme to test it after you rebase? That is a hard requirement for the PR being merged.

@injust
Copy link
Contributor Author

injust commented Jul 2, 2024

Rebased and built. n.b. there's an extra trailing newline in catppuccin.gitconfig now.

@uncenter

This comment was marked as outdated.

@uncenter
Copy link
Member

uncenter commented Jul 2, 2024

Oh I see what you mean. I have a fix, one sec.

delta.tera Outdated Show resolved Hide resolved
injust and others added 2 commits July 2, 2024 16:37
@injust
Copy link
Contributor Author

injust commented Jul 2, 2024

Looks good now, thanks for the fix!

@uncenter
Copy link
Member

uncenter commented Jul 2, 2024

Looks good now, thanks for the fix!

No problem. We had a similar issue with another port, will note it down to add that tip to the docs!

@Anomalocaridid Anomalocaridid merged commit 48273a5 into catppuccin:main Jul 3, 2024
@Anomalocaridid
Copy link
Collaborator

Thank you!

@injust injust deleted the patch-3 branch July 3, 2024 20:35
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