From 8ef46e0628c7f12844485b4c292940c0ddbe50a8 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Sat, 29 Sep 2007 19:49:38 -0700 Subject: [PATCH] Typo fixes and clarifications suggested by Junio C Hamano --- tour.mdwn | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/tour.mdwn b/tour.mdwn index 2d209d7..1c1333f 100644 --- a/tour.mdwn +++ b/tour.mdwn @@ -292,21 +292,21 @@ view of history. Create a standard "hello, world" program -By default, this command prints a brief paragraph of output for each -change to the project that was recorded. In git terminology, we -call each of these recorded events a commit. +This command prints a record of output for each change to the project +that was recorded. In git terminology, we call each of these recorded +events a commit. -The fields in a record of output from “git log” are as follows. +The default fields in a record of output from “git log” are as follows. * commit This field consists of a string of 40 hexadecimal characters. This is a unique identifier for referring to particular commits. * Author The identity of the person who authored the commit. This field consist of two sub-fields for the user's name and email address, (or at least an email-like idenitifer). Note that git - stores a separate "Committer" field for the person who commited - the change, (since often an author will email a change to a - maintainer that commits it). The "git log" command doesn't display - the Committer, but other git tools do. + also stores a separate "Committer" field for the person who + commited the change, (since often an author will email a change to + a maintainer that commits it). See below for how to instruct "git + log" to display it as well. * Date The date and time on which the commit was authored, (again stored separately from the date the change was committed). timezone in which it was created. (The date and time are displayed @@ -315,8 +315,13 @@ The fields in a record of output from “git log” are as follows. entered to describe the commit, (generally a one-line summary followed by more supporting text). -The default output printed by “git log” is purely a summary; it is -missing a lot of detail. +The output of the "git log" command can be made more or less verbose +by means of the --pretty option. For example, with "git log +--pretty=short" the commit identifier will be omitted and only the +first line of each commit message will be show. And with "git log +--pretty=fuller", (the name 'fuller' is in contrast to the default +--pretty=full), the committer name and dates will be printed in +addition to the author name and dates. #### 2.4.1 Commits, revisions, and talking to other people @@ -723,7 +728,7 @@ as a comment. You can use any text you like as the value of the name and email configuration items, since this information is for reading by other people, not for interpreting by git. It is conventional to use your -actual name as well as a valid email address. But some poepl, (notably +actual name as well as a valid email address. But some people, (notably Linus Torvalds, the original author of git), actually like the default username@hostname convention that git falls back on without any additional information about an email address. There's no requirement @@ -869,8 +874,8 @@ it. Wouldn't it be nice to touch those up before I post this commit with a never-to-be-changed again commit identifier? This is the exact situation for which "git commit --amend" was - -So I can just run that now and fix the broken commit message: +invented. So I can just run that now and fix the broken commit +message: $ git commit --amend @@ -1091,7 +1096,7 @@ markers in the files and instruct you to resolve the conflicts. When you are finished, you would issue a "git commit -a" to create the merge commit. -#### 2.8.3 Using "git remote" to pull changes other repositories +#### 2.8.3 Using "git remote" to pull changes from other repositories We've already described how "git pull" will pull in changes from the repository which was the origin of the clone operation. Git also -- 2.43.0