Skip to content
This repository has been archived by the owner on May 2, 2019. It is now read-only.

Remove cruft sentence from Chapter 6. #364

Merged
merged 1 commit into from
Feb 1, 2013

Conversation

wcarss
Copy link
Contributor

@wcarss wcarss commented Feb 1, 2013

This sentence in 'Splitting a Commit' described the same events as
the sentences following it, only in less detail. It appears that at
some point the content was fleshed out, but the original sentence
got left in by mistake.

@GArik
Copy link
Contributor

GArik commented Feb 1, 2013

IMO the commit is good. But it's probably better to not drop "take the changes that have been reset, and create multiple commits out of them" part completely. I suggest to move this part closer to the end of the paragraph like this:

"When you save and exit the editor, Git rewinds to the parent of the first commit in your list, applies the first commit (f7f3f6d), applies the second (310154e), and drops you to the console. There, you can do a mixed reset of that commit with git reset HEAD^, which effectively undoes that commit and leaves the modified files unstaged. Now you can [take the changes that have been reset, and create multiple commits out of them. Simply] stage and commit files until you have several commits, and run git rebase --continue when you’re done:"

@wcarss
Copy link
Contributor Author

wcarss commented Feb 1, 2013

That reads great to me. I'll update this.

@wcarss
Copy link
Contributor Author

wcarss commented Feb 1, 2013

Ick. I copied it from you and mucked up the syntax around the commits. I think I'll fix that and if it looks good, squash it onto my master and make a new request. (If there's a nicer way to clean this now it's out here, I'm open to it. I noticed the weird sentence because I'm inexperienced with these operations.)

@GArik
Copy link
Contributor

GArik commented Feb 1, 2013

I think I'll fix that and if it looks good, squash it onto my master

Yeah, looks good to me. Please squash your commits and then i think it's ready to be pulled.
Reviewed-by: /me :)

The first sentence in paragraph 2 of 'Splitting a Commit' did not
make much sense in the context of the rest of the paragraph. This
commit removes it and integrates the useful bits into a later point
where they flow more sensibly.
@wcarss
Copy link
Contributor Author

wcarss commented Feb 1, 2013

Done.

jnavila added a commit that referenced this pull request Feb 1, 2013
Remove cruft sentence from Chapter 6.
@jnavila jnavila merged commit 2f88d98 into progit:master Feb 1, 2013
@jnavila
Copy link
Member

jnavila commented Feb 1, 2013

Merged. Thanks!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants