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

Change description of rebase and cherry-pick #1

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

snan
Copy link

@snan snan commented Mar 3, 2023

Both of them do copy, it's just that rebase also moves the branch head
making the previous commits slightly less accessible. Also it's git
cherry-pick with a hyphen.

snan added 5 commits March 3, 2023 08:21
Both of them do copy, it's just that rebase also moves the branch head
making the previous commits slightly less accessible. Also it's git
cherry-pick with a hyphen.
Skip this commit if you only want the other changes since
this one is a bit of a bigger change.
@snan
Copy link
Author

snan commented Mar 3, 2023

Here's how this started (in case this explanation makes this PR less creepy):

  1. I stumbled over this page after searching for info on how to set up netrc as a credential's helper
  2. I wanted to tell you that rebase does copy but you didn't have an email under /contact, only links to sites I don't wanna register on (like LinkedIn and MySpace)
  3. I thought I'd do the old "clone someone's repo and look in the git log" polite way to find out someone's email address, but you had the email listing set to off in GitHub settings
  4. I thought waiddaminute, there's a repo of the entire site
  5. I was reminded of why RST sucks 💁🏻‍♀️

Take it or leave it, thanks for a great git resource, I had never heard of your web page before.

@snan
Copy link
Author

snan commented Mar 3, 2023

I left the commits as separate rather than squashed in case you wanna skip some of them 🤷🏻‍♀️

@grahamlopez
Copy link
Owner

Hi! Thanks so much for taking the time to leave me feedback.

I actually keep the sources for this website in a private repo and only keep the generated result in this public one. So I have made most of the changes you suggested over there and updated the site.

I am keeping the description of git rebase as it is for now, because I think for a mental model it is fine to think of the commits as being moved instead of copied insofar as you can't easily reach the before-rebase commits through normal beginner level git workflows (e.g. without using the reflog). And if/when cleared from the reflog, I believe they eventually get collected by the garbage collector.

@snan
Copy link
Author

snan commented Mar 6, 2023 via email

@grahamlopez
Copy link
Owner

That's also a fair point. I'll keep thinking about it. Considering them as copied also seems confusing to me, as they aren't readily accessible with their pre-rebase history (as with e.g. cherry-pick). IDK, like I said, you've given me something to think about.

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