Skip to content

Conversation

sivaraam
Copy link
Contributor

This PR adds a few changes to chapter 7 of the book that seemed good to me ;) Few more changes are to would possibly be made in a following PR. There's one change that I wanted to make in this PR but held it back to get comments regarding it. It's regarding the lines quoted below found in the Changing the Last Commit subsection of the Rewriting History section,

You stage the changes you want by editing a file and running git add on it or git rm to a tracked file, and the subsequent git commit --amend takes your current staging area and makes it the snapshot for the new commit.

As far as I know, amending takes things in the current staging area and adds it to the snapshot of the last commit. So shouldn't the above sentence be rephrased as follows,

You stage the changes you want by editing a file and running git add on it or git rm to a tracked file, and the subsequent git commit --amend takes your current staging area and adds it to the last snapshot making it the snapshot for the new commit.

Kaartic Sivaraam added 9 commits May 18, 2017 14:50
   The sentence wasn't consistent and
   was corrected.
    The reflog output wasn't reflecting
    the new message shown by git for merges
  Made the example command reflect the command
  that needs to be used by the user.
  A sentence thatput the main point at the end
  didn't seem nice and thus the point was specified
  earlier followed by it's outcome

  A sample code was made better as it seems to have
  the same effect
 * Removed time related words
 * Split a sentence to improve readability
Copy link
Member

@ben ben left a comment

Choose a reason for hiding this comment

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

Just one comment.

It is called with the `-L` option to `git log` and will show you the history of a function or line of code in your codebase.
This can be really helpful.
It is called with the `-L` option to `git log`.
It will show you the history of a function or line of code in your codebase.
Copy link
Member

Choose a reason for hiding this comment

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

The structure here is kind of stilted. Instead of these three sentences, what about just one:

Simply run git log with the -L option, and it will show you the history of a function or line of code in your codebase.

Copy link
Contributor Author

@sivaraam sivaraam Jun 19, 2017

Choose a reason for hiding this comment

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

That's much better and the change has been done 😄

The long sentences were merged into one short concise
to increas readability.
@sivaraam
Copy link
Contributor Author

@ben Any thoughts about the question in the description ?

@ben
Copy link
Member

ben commented Jun 19, 2017

Ah, right, I somehow missed that at first. Your change sounds like an improvement. Go ahead and include it here, and we'll get this merged!

@sivaraam
Copy link
Contributor Author

sivaraam commented Jun 20, 2017

Made the change but with a little modification. I guess it deserves review. The current sentence is,

You stage the changes you want by editing a file and running git add on it or git rm to a tracked file, and the subsequent git commit --amend takes your current staging area and adds it to the last snapshot making it the snapshot of the last commit.

BTW, sorry about that grammatical error in the commit message. Should have been careful.

@ben ben merged commit 44a832d into progit:master Jun 20, 2017
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