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

Additions to git tips & tricks - a few small additions #572

Open
TraceyC77 opened this issue Oct 20, 2024 · 0 comments
Open

Additions to git tips & tricks - a few small additions #572

TraceyC77 opened this issue Oct 20, 2024 · 0 comments

Comments

@TraceyC77
Copy link
Contributor

TraceyC77 commented Oct 20, 2024

Do a quick lint smoketest in a worktree

    git add . && git commit -m "temp" && go-task check

If that looks good, do a:

    git reset --hard HEAD^

To undo the "temp" commit above and do regular commits (one per package).

Git pull that preserves existing work

to pull in changes from main while preserving existing work

git pull origin main --rebase --autostash

Get logs only for the current packaging directory

git log .

Add -p to see the patches (changes).

Maintenance

Git has automatic maintenance, enabled using:

gotosoluspkgs
git maintenance start

Read the maintenance docs for more information.

How to use git format-patch

If you use git format-patch with the arguments --zero-commit and --no-signature it'll zero out the commit hash and strip the git version from the bottom.

This can help reduce the diff from updating patches in the future a bit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Backlog
Development

No branches or pull requests

1 participant