command. If you are completely stuck, simply run “git help”; it will
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\>"?]
+"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>`?]
[XXX: The original hgbook includes the complete output of "hg
help init" at this point. I'm not including the corresponding
commit a1a0e8b392b17caf50325498df54802fe3c03710
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 15:43:07 2005 -0700
-
+
Trim comments.
-
+
commit 72d4f10e4a27dbb09ace1503c20dbac1912ee451
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 13:15:58 2005 -0700
-
+
Get make to generate the final binary from a .o file.
-
+
commit 13ed136b983a9c439eddeea8a1c2076cffbb685f
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 13:15:43 2005 -0700
-
+
Introduce a typo into hello.c.
-
+
commit 0a633bf58b45fcf1a8299d3c82cd1fd26d3f48f2
Author: Bryan O'Sullivan <mpm@selenic.com>
Date: Fri Aug 26 01:21:28 2005 -0700
-
+
Create a makefile
-
+
commit db7117a9dd9a6e57e8632ea5848e1101eee0fbde
Author: Bryan O'Sullivan <mpm@selenic.com>
Date: Fri Aug 26 01:20:50 2005 -0700
-
+
Create a standard "hello, world" program
This command prints a record of output for each change to the project
commit a1a0e8b392b17caf50325498df54802fe3c03710
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 15:43:07 2005 -0700
-
+
Trim comments.
-
+
commit 72d4f10e4a27dbb09ace1503c20dbac1912ee451
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 13:15:58 2005 -0700
-
+
Get make to generate the final binary from a .o file.
-
+
commit 13ed136b983a9c439eddeea8a1c2076cffbb685f
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 13:15:43 2005 -0700
-
+
Introduce a typo into hello.c.
#### 2.4.4 Other log filters
commit 72d4f10e4a27dbb09ace1503c20dbac1912ee451
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 13:15:58 2005 -0700
-
+
Get make to generate the final binary from a .o file.
-
+
commit 0a633bf58b45fcf1a8299d3c82cd1fd26d3f48f2
Author: Bryan O'Sullivan <mpm@selenic.com>
Date: Fri Aug 26 01:21:28 2005 -0700
-
+
Create a makefile
And "git log" can also filter based on the dates at which commits were
commit a1a0e8b392b17caf50325498df54802fe3c03710
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 15:43:07 2005 -0700
-
+
Trim comments.
-
+
hello.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
-
+
commit 72d4f10e4a27dbb09ace1503c20dbac1912ee451
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 13:15:58 2005 -0700
-
+
Get make to generate the final binary from a .o file.
-
+
Makefile | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
-
+
commit 13ed136b983a9c439eddeea8a1c2076cffbb685f
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 13:15:43 2005 -0700
-
+
Introduce a typo into hello.c.
-
+
hello.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 13ed136b983a9c439eddeea8a1c2076cffbb685f
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 13:15:43 2005 -0700
-
+
Introduce a typo into hello.c.
-
+
diff --git a/hello.c b/hello.c
index ed55ec0..80b260c 100644
--- a/hello.c
+++ b/hello.c
@@ -11,6 +11,6 @@
-
+
int main(int argc, char **argv)
{
- printf("hello, world!\n");
commit 13ed136b983a9c439eddeea8a1c2076cffbb685f
Author: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue Sep 6 13:15:43 2005 -0700
-
+
Introduce a typo into hello.c.
-
+
diff --git a/hello.c b/hello.c
index ed55ec0..80b260c 100644
--- a/hello.c
+++ b/hello.c
@@ -11,6 +11,6 @@
-
+
int main(int argc, char **argv)
{
- printf("hello, world!\n");
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
- 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
- options start with one (e.g. -n).
+ 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
+ options start with one (e.g. `-n`).
* Option naming and usage is consistent across commands. For
example, every command that lets you specify a commit identifier
After you've made that change, the “git status” command will tell you
what git knows about the files in the repository.
- $ ls
+ $ ls
hello.c Makefile
$ git status
# On branch master
--- a/hello.c
+++ b/hello.c
@@ -7,6 +7,6 @@
-
+
int main(int argc, char **argv)
{
- printf("hello, world!\");
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
then it will be there already). The initial contents of your
.gitconfig should look like this.
- # This is a git configuration file.
+ # This is a git configuration file.
[user]
name = Your Name
email = you@example.com
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,
-just remove it as normal before committing and "git commit -a" will
+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,
+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.
-The editor that the “git commit” command drops us into will contain an
+The editor that the `git commit` command drops us into will contain an
empty line, followed by a number of lines starting with “#”. These
-lines contain the same information as seen in "git status" before:
+lines contain the same information as seen in `git status` before:
empty line
# Please enter the commit message for your changes.
$ git log --pretty=short
commit 3ef5535144da88a854f7930503845cd44506c2e2
Author: Censored Person <censored.person@example.org>
-
+
include buildmeister/commondefs. Add an exports and install
As far as the remainder of the contents of the commit message are
commit fd21e5d6c5eedee70137229ebf348c25181812ab
Author: Carl Worth <cworth@cworth.org>
Date: Fri Sep 28 12:50:16 2007 -0700
-
+
Fixed the typo so the program actuall complies now.
-
+
diff --git a/hello.c b/hello.c
index 9a3ff79..ea364d3 100644
--- a/hello.c
+++ b/hello.c
@@ -7,6 +7,6 @@
-
+
int main(int argc, char **argv)
{
- printf("hello, world!\");
commit 3c54ac672ec1130b36837f1b708054a7a1d402de
Author: Carl Worth <cworth@cworth.org>
Date: Fri Sep 28 12:50:16 2007 -0700
-
+
Fixed the typo so the program actually compiles now.
-
+
diff --git a/hello.c b/hello.c
index 9a3ff79..ea364d3 100644
--- a/hello.c
+++ b/hello.c
@@ -7,6 +7,6 @@
-
+
int main(int argc, char **argv)
{
- printf("hello, world!\");
commit 3c54ac672ec1130b36837f1b708054a7a1d402de
Author: Carl Worth <cworth@cworth.org>
Date: Fri Sep 28 12:50:16 2007 -0700
-
+
Fixed the typo so the program actually compiles now.
As expected, we received just the one commit.
commit 3c54ac672ec1130b36837f1b708054a7a1d402de
Author: Carl Worth <cworth@cworth.org>
Date: Fri Sep 28 12:50:16 2007 -0700
-
+
Fixed the typo so the program actually compiles now.
Another helpful way of visualizing what happened with "git fetch" here
## Appendix D
Open Publication License
-Version 1.0, 8 June 1999
+Version 1.0, 8 June 1999
### D.1 Requirements on both unmodified and modified versions
incorporation of it by reference (with any options elected by the
author(s) and/or publisher) is displayed in the reproduction.
-Proper form for an incorporation by reference is as follows:
+Proper form for an incorporation by reference is as follows:
Copyright (c) year by author’s name or designee. This material may be
distributed only subject to the terms and conditions set forth in the
translations, anthologies, compilations and partial documents, must
meet the following requirements:
- 1. The modified version must be labeled as such.
+ 1. The modified version must be labeled as such.
2. The person making the modifications must be identified and the
modifications dated.
3. Acknowledgement of the original author and publisher if
applicable must be retained according to normal academic citation
practices.
- 4. The location of the original unmodified document must be identified.
+ 4. The location of the original unmodified document must be identified.
5. The original author’s (or authors’) name(s) may not be used to
assert or imply endorsement of the resulting document without the
original author’s (or authors’) permission.
projects / hgbook-git / blobdiff