* Gentoo
- emerge git
+ emerge dev-util/git
* OpenSUSE
print a brief list of commonly-used commands, along with a description
of what each does. If you ask for help on a specific command (such as
"git help init"), it prints more detailed information. [XXX: Does "git
-help <foo>" work universally as a built-in or does it expect man to be
-present and just call out to "man git-<foo>"?]
+help \<foo\>" work universally as a built-in or does it expect man to be
+present and just call out to "man git-\<foo\>"?]
[XXX: The original hgbook includes the complete output of "hg
help init" at this point. I'm not including the corresponding
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
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
systems.
* Most options have long names. For example, as we’ve already seen,
- the “git log" command accepts a --max-count=<number> option.
+ the “git log" command accepts a --max-count=\<number\> option.
* Some options have short, single-character names. Often these are
- aliases for long commands, (such as "-n <number>" instead of
- --max-count=<number>), but sometimes the option exists in
+ aliases for long commands, (such as "-n \<number\>" instead of
+ --max-count=\<number\>), but sometimes the option exists in
short-form with no long-form equivalent, (such as -p). [XXX: It
wouldn't hurt to fix this by adding --patch, etc. right?]
* Long options start with two dashes (e.g. --max-count), while short
no changes added to commit (use "git add" and/or "git commit -a")
First "git status" tells us that the current branch is "master". This
-means that the master branch is what will be updatea when we create a
+means that the master branch is what will be updated when we create a
new commit.
Note: In git a branch is a very simple notion---it's simply a name
#### 2.7.1 Introducing yourself to git
-Before we run "git commit" though, we should introduce ourself to git.
-Git records your name and address with each change that you commit,
-(as both author and committer unless you tell it otherwise), so that
-you and others will later be able to tell who made each change.
+Before you run "git commit" though, you should introduce yourself to
+git. Git records your name and email address with each change that
+you commit, (as both author and committer unless you tell it
+otherwise), so that you and others will later be able to tell who made
+each change.
Git tries to automatically figure out a sensible name and address to
attribute to both author and committer if you haven't explicitly told
the author and committer name and email as soon as a value is found):
1. If you specify a --author option to the “git commit” command on
- the command line, followed by a "Real Name <email@example.com>"
+ the command line, followed by a "Real Name \<email@example.com\>"
string, then this name and addresss will be used for the author
fields. The committer fields will still be determined as
below. This option is very helpful for when applying a commit
originally authored by someone other than yourself.
- 2. If any of the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL,
- GIT_COMMITTER_NAME, or GIT_COMMITER_EMAIL environment variables
+ 2. If any of the `GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL`,
+ `GIT_COMMITTER`_NAME, or `GIT_COMMITER_EMAIL` environment variables
are set, then those values will be used for the corresponding
fields.
3. If you have a file in your home directory called .gitconfig, with
again with name or email settings in the [user] section, then
these values will be used to set any remaining author and
committer fields.
- 5. If you have set the EMAIL environment variable, this will be used
+ 5. If you have set the `EMAIL` environment variable, this will be used
to set author and committer email addresses if still unset.
6. git will query your system to find out your real name from
available GECOS field and your username, hostname, and domain to
error message instructing you how to use "git config" to tell git your
name and email address.
-You should think of the GIT_AUTHOR/COMMITER_NAME/EMAIL environment
+You should think of the `GIT_AUTHOR`/`COMMITER_NAME`/`EMAIL` environment
variables and the --author option to the “git commit” command as ways
to override git’s default selection. For normal use, the simplest and
most robust way to set your information is by creating a .gitconfig
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
Note: The -a on the command-line instructs git to commit the new
content of *all* tracked files that have been modified. This is a
convenience over explicitly listing filenames to be committed on the
-"git commit" command line. It is useful to use "git commit <files>"
+"git commit" command line. It is useful to use "git commit \<files\>"
when there is a need to commit only some subset of the files that have
been modified.
If new files need to be committed for the first time, just use "git
-add <file>" before "git commit -a". If a file needs to be removed,
+add \<file\>" before "git commit -a". If a file needs to be removed,
just remove it as normal before committing and "git commit -a" will
notice that---it does not need to be explicitly told about the
removal.
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
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
projects / cworth.org / commitdiff