8000 Document Git worktree by hugovk · Pull Request #1255 · python/devguide · GitHub
[go: up one dir, main page]

Skip to content

Document Git worktree #1255

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

Merged
merged 7 commits into from
Jan 3, 2024
Merged

Document Git worktree #1255

merged 7 commits into from
Jan 3, 2024

Conversation

hugovk
Copy link
Member
@hugovk hugovk commented Dec 30, 2023

Fixes #105.

Based on the instructions in the first post there. I've been using this for a couple of months.

Also add the .editorconfig from CPython and add some handy pre-commit hooks.


📚 Documentation preview 📚: https://cpython-devguide--1255.org.readthedocs.build/getting-started/git-boot-camp/#git-worktree

$ cd ../main
$ git checkout my-feature-branch
...

Copy link
Member
@merwok merwok Dec 30, 2023

Choose a reason for hiding this comment

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

Are more steps needed to configure pulls from upstream and pushes to origin (personal fork)?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've committed Ezio's suggestion that shows a more concrete example of pushing and switching back, how does 3b26368 (#1255) look?

Copy link
Contributor
@itamaro itamaro left a comment

Choose a reason for hiding this comment

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

the git worktree addition and the editorcofig addition seem unrelated - any reason to do both in the same PR?

@hugovk
Copy link
Member Author
hugovk commented Dec 30, 2023

the git worktree addition and the editorcofig addition seem unrelated - any reason to do both in the same PR?

I added them to help whilst making this PR, and seemed easier to keep them together, but I can split it to another PR if you like?

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
@itamaro
Copy link
Contributor
itamaro commented Dec 30, 2023

I added them to help whilst making this PR, and seemed easier to keep them together, but I can split it to another PR if you like?

My personal preference is one-theme-per-commit, but this change is small enough that it's not critical, so up to you!

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Copy link
Contributor
@itamaro itamaro left a comment

Choose a reason for hiding this comment

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

LG!

Co-authored-by: Itamar Oren <itamarost@gmail.com>
Copy link
Contributor
@erlend-aasland erlend-aasland left a comment

Choose a reason for hiding this comment

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

Nice; thanks, Hugo.

@hugovk
Copy link
Member Author
hugovk commented Jan 3, 2024

Thanks all for the reviews!

@hugovk hugovk merged commit bcd0c8a into python:main Jan 3, 2024
@hugovk hugovk deleted the git-worktree branch January 3, 2024 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement guide-new content Additions; New content or section needed topic-git
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add git worktree command [was: hg share -> git worktree]
5 participants
0