git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Minor correction to Git book
@ 2013-05-08 10:24 Robin Messer
  2013-05-08 10:51 ` John Keeping
  0 siblings, 1 reply; 4+ messages in thread
From: Robin Messer @ 2013-05-08 10:24 UTC (permalink / raw)
  To: git@vger.kernel.org

I'm just learning Git so I don't yet know how to submit this
as a patch, but I'm reading the Git Book to get myself started
and I think there is a mistake on the page at:

http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository

It says: "For another example, if you stage the benchmarks.rb file and
then edit it, you can use git diff to see the changes in the file that
are staged and the changes that are unstaged:"

I believe this should say "git status" rather than "git diff".

--
Robin

This email is confidential and intended solely for the use of the individual to whom it is addressed. If you are not the intended recipient, be advised that you have received this email in error and that any use, disclosure, copying or distribution or any action taken or omitted to be taken in reliance on it is strictly prohibited. If you have received this email in error please contact the sender. Any views or opinions presented in this email are solely those of the author and do not necessarily represent those of Altran.

Although this email and any attachments are believed to be free of any virus or other defect, no responsibility is accepted by Altran or any of its associated companies for any loss or damage arising in any way from the receipt or use thereof.

Altran UK Ltd:

Company Number: 3302507, registered in England and Wales

Registered Address: 22 St. Lawrence Street, Bath, BA1 1AN

VAT Registered in Great Britain: 682635707

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Minor correction to Git book
  2013-05-08 10:24 Minor correction to Git book Robin Messer
@ 2013-05-08 10:51 ` John Keeping
  2013-05-08 11:01   ` Robin Messer
  0 siblings, 1 reply; 4+ messages in thread
From: John Keeping @ 2013-05-08 10:51 UTC (permalink / raw)
  To: Robin Messer; +Cc: git@vger.kernel.org

On Wed, May 08, 2013 at 11:24:56AM +0100, Robin Messer wrote:
> I'm just learning Git so I don't yet know how to submit this
> as a patch, but I'm reading the Git Book to get myself started
> and I think there is a mistake on the page at:
> 
> http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository
> 
> It says: "For another example, if you stage the benchmarks.rb file and
> then edit it, you can use git diff to see the changes in the file that
> are staged and the changes that are unstaged:"
> 
> I believe this should say "git status" rather than "git diff".

I think the text is correct as it stands.  "git status" shows you that
there are changes that are staged and unstaged, "git diff" (and "git
diff --cached") shows you what those changes are.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: Minor correction to Git book
  2013-05-08 10:51 ` John Keeping
@ 2013-05-08 11:01   ` Robin Messer
  2013-05-08 11:08     ` John Keeping
  0 siblings, 1 reply; 4+ messages in thread
From: Robin Messer @ 2013-05-08 11:01 UTC (permalink / raw)
  To: John Keeping; +Cc: git@vger.kernel.org

> I think the text is correct as it stands.  "git status" shows you that
> there are changes that are staged and unstaged, "git diff" (and "git
> diff --cached") shows you what those changes are.

Thanks, but the command line which follows that text does actually use
"git status" to show which files (staged and unstaged) have changes.
The text I quoted is introducing that command.

Then the next example shows you how to use "git diff" to see what the
actual unstaged changes to those files are.

If this is not the appropriate place to report such things, please point
me at the correct one.

Thanks,

Robin.

This email is confidential and intended solely for the use of the individual to whom it is addressed. If you are not the intended recipient, be advised that you have received this email in error and that any use, disclosure, copying or distribution or any action taken or omitted to be taken in reliance on it is strictly prohibited. If you have received this email in error please contact the sender. Any views or opinions presented in this email are solely those of the author and do not necessarily represent those of Altran.

Although this email and any attachments are believed to be free of any virus or other defect, no responsibility is accepted by Altran or any of its associated companies for any loss or damage arising in any way from the receipt or use thereof.

Altran UK Ltd:

Company Number: 3302507, registered in England and Wales

Registered Address: 22 St. Lawrence Street, Bath, BA1 1AN

VAT Registered in Great Britain: 682635707

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Minor correction to Git book
  2013-05-08 11:01   ` Robin Messer
@ 2013-05-08 11:08     ` John Keeping
  0 siblings, 0 replies; 4+ messages in thread
From: John Keeping @ 2013-05-08 11:08 UTC (permalink / raw)
  To: Robin Messer; +Cc: git@vger.kernel.org

On Wed, May 08, 2013 at 12:01:00PM +0100, Robin Messer wrote:
> > I think the text is correct as it stands.  "git status" shows you that
> > there are changes that are staged and unstaged, "git diff" (and "git
> > diff --cached") shows you what those changes are.
> 
> Thanks, but the command line which follows that text does actually use
> "git status" to show which files (staged and unstaged) have changes.
> The text I quoted is introducing that command.
> 
> Then the next example shows you how to use "git diff" to see what the
> actual unstaged changes to those files are.

Ah, OK.  I read your email without looking at the context.

> If this is not the appropriate place to report such things, please point
> me at the correct one.

The ProGit book is maintained at https://github.com/progit/progit

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-05-08 11:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-08 10:24 Minor correction to Git book Robin Messer
2013-05-08 10:51 ` John Keeping
2013-05-08 11:01   ` Robin Messer
2013-05-08 11:08     ` John Keeping

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).