From 361c1335bb152db70cab1086e3f8505e63b60354 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Nov 2007 12:17:22 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.5-666-gfb5f --- core-tutorial.html | 6 +++--- core-tutorial.txt | 4 ++-- cvs-migration.html | 2 +- diffcore.html | 2 +- everyday.html | 2 +- git-add.html | 3 ++- git-add.txt | 1 + git-am.html | 2 +- git-annotate.html | 2 +- git-apply.html | 2 +- git-archimport.html | 2 +- git-archive.html | 2 +- git-bisect.html | 2 +- git-blame.html | 2 +- git-branch.html | 2 +- git-bundle.html | 2 +- git-cat-file.html | 2 +- git-check-attr.html | 2 +- git-check-ref-format.html | 2 +- git-checkout-index.html | 2 +- git-checkout.html | 2 +- git-cherry-pick.html | 2 +- git-cherry.html | 2 +- git-citool.html | 2 +- git-clean.html | 2 +- git-clone.html | 2 +- git-commit-tree.html | 2 +- git-commit.html | 13 ++++++++----- git-commit.txt | 11 +++++++---- git-config.html | 2 +- git-count-objects.html | 2 +- git-cvsexportcommit.html | 2 +- git-cvsimport.html | 2 +- git-cvsserver.html | 2 +- git-daemon.html | 2 +- git-describe.html | 2 +- git-diff-files.html | 2 +- git-diff-index.html | 2 +- git-diff-tree.html | 2 +- git-diff.html | 2 +- git-fast-import.html | 2 +- git-fetch-pack.html | 2 +- git-fetch.html | 2 +- git-filter-branch.html | 2 +- git-fmt-merge-msg.html | 2 +- git-for-each-ref.html | 2 +- git-format-patch.html | 2 +- git-fsck-objects.html | 2 +- git-fsck.html | 2 +- git-gc.html | 2 +- git-get-tar-commit-id.html | 2 +- git-grep.html | 2 +- git-gui.html | 2 +- git-hash-object.html | 2 +- git-http-fetch.html | 2 +- git-http-push.html | 2 +- git-imap-send.html | 2 +- git-index-pack.html | 2 +- git-init-db.html | 2 +- git-init.html | 2 +- git-instaweb.html | 2 +- git-log.html | 2 +- git-lost-found.html | 2 +- git-ls-files.html | 2 +- git-ls-remote.html | 2 +- git-ls-tree.html | 2 +- git-mailinfo.html | 2 +- git-mailsplit.html | 2 +- git-merge-base.html | 2 +- git-merge-file.html | 2 +- git-merge-index.html | 2 +- git-merge-one-file.html | 2 +- git-merge-tree.html | 2 +- git-merge.html | 2 +- git-mergetool.html | 2 +- git-mktag.html | 2 +- git-mktree.html | 2 +- git-mv.html | 2 +- git-name-rev.html | 2 +- git-pack-objects.html | 2 +- git-pack-redundant.html | 2 +- git-pack-refs.html | 2 +- git-parse-remote.html | 2 +- git-patch-id.html | 2 +- git-peek-remote.html | 2 +- git-prune-packed.html | 2 +- git-prune.html | 2 +- git-pull.html | 2 +- git-push.html | 2 +- git-quiltimport.html | 2 +- git-read-tree.html | 2 +- git-rebase.html | 2 +- git-receive-pack.html | 2 +- git-reflog.html | 2 +- git-relink.html | 2 +- git-remote.html | 4 ++-- git-remote.txt | 2 +- git-repack.html | 2 +- git-repo-config.html | 2 +- git-request-pull.html | 2 +- git-rerere.html | 2 +- git-reset.html | 2 +- git-rev-list.html | 2 +- git-rev-parse.html | 2 +- git-revert.html | 2 +- git-rm.html | 2 +- git-runstatus.html | 2 +- git-send-email.html | 2 +- git-send-pack.html | 2 +- git-sh-setup.html | 2 +- git-shell.html | 2 +- git-shortlog.html | 2 +- git-show-branch.html | 2 +- git-show-index.html | 2 +- git-show-ref.html | 2 +- git-show.html | 2 +- git-stash.html | 2 +- git-status.html | 2 +- git-stripspace.html | 2 +- git-submodule.html | 2 +- git-svn.html | 2 +- git-symbolic-ref.html | 2 +- git-tag.html | 2 +- git-tar-tree.html | 2 +- git-tools.html | 2 +- git-unpack-file.html | 2 +- git-unpack-objects.html | 2 +- git-update-index.html | 2 +- git-update-ref.html | 2 +- git-update-server-info.html | 2 +- git-upload-archive.html | 2 +- git-upload-pack.html | 2 +- git-var.html | 2 +- git-verify-pack.html | 2 +- git-verify-tag.html | 2 +- git-whatchanged.html | 2 +- git-write-tree.html | 2 +- git.html | 2 +- gitattributes.html | 19 ++++++++++--------- gitattributes.txt | 17 +++++++++-------- gitignore.html | 2 +- gitk.html | 2 +- gitmodules.html | 2 +- glossary.html | 2 +- hooks.html | 2 +- howto-index.html | 2 +- howto/revert-branch-rebase.html | 2 +- repository-layout.html | 2 +- tutorial-2.html | 2 +- tutorial.html | 2 +- user-manual.html | 6 +++--- user-manual.txt | 6 +++--- 152 files changed, 191 insertions(+), 181 deletions(-) diff --git a/core-tutorial.html b/core-tutorial.html index 72122c4d27..dfba7619b5 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -1398,7 +1398,7 @@ back to the earlier repository with "hello" and "example" file, and bring ourselves back to the pre-merge state:

-
$ git show-branch --more=3 master mybranch
+
$ git show-branch --more=2 master mybranch
 ! [master] Merge work in mybranch
  * [mybranch] Merge work in mybranch
 --
@@ -1454,7 +1454,7 @@ this:

 
This is the same git-read-tree command we have already seen,
 but it takes three trees, unlike previous examples.  This reads
 the contents of each tree into different stage in the index
-file (the first tree goes to stage 1, the second stage 2,
+file (the first tree goes to stage 1, the second to stage 2,
 etc.).  After reading three trees into three stages, the paths
 that are the same in all three stages are collapsed into stage
 0.  Also paths that are the same in two of three stages are
@@ -1967,7 +1967,7 @@ to follow, not easier.
diff --git a/core-tutorial.txt b/core-tutorial.txt index 401d1deca0..bd6cd41245 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -1152,7 +1152,7 @@ back to the earlier repository with "hello" and "example" file, and bring ourselves back to the pre-merge state: ------------ -$ git show-branch --more=3 master mybranch +$ git show-branch --more=2 master mybranch ! [master] Merge work in mybranch * [mybranch] Merge work in mybranch -- @@ -1215,7 +1215,7 @@ $ git-read-tree -m -u $mb HEAD mybranch This is the same `git-read-tree` command we have already seen, but it takes three trees, unlike previous examples. This reads the contents of each tree into different 'stage' in the index -file (the first tree goes to stage 1, the second stage 2, +file (the first tree goes to stage 1, the second to stage 2, etc.). After reading three trees into three stages, the paths that are the same in all three stages are 'collapsed' into stage 0. Also paths that are the same in two of three stages are diff --git a/cvs-migration.html b/cvs-migration.html index 811fb23026..c59877c475 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -416,7 +416,7 @@ repositories without the need for a central maintainer.

diff --git a/diffcore.html b/diffcore.html index 7fcb0dd8eb..4870e13183 100644 --- a/diffcore.html +++ b/diffcore.html @@ -541,7 +541,7 @@ t diff --git a/everyday.html b/everyday.html index 93c1bc4256..6925ff047a 100644 --- a/everyday.html +++ b/everyday.html @@ -1069,7 +1069,7 @@ upload to public HTTP server hosted by your ISP. diff --git a/git-add.html b/git-add.html index b491d57019..89dd4d7abf 100644 --- a/git-add.html +++ b/git-add.html @@ -552,6 +552,7 @@ diff

git-status(1) git-rm(1) +git-reset(1) git-mv(1) git-commit(1) git-update-index(1)

@@ -570,7 +571,7 @@ diff
diff --git a/git-add.txt b/git-add.txt index 963e1ab1e2..63829d93cc 100644 --- a/git-add.txt +++ b/git-add.txt @@ -224,6 +224,7 @@ See Also -------- gitlink:git-status[1] gitlink:git-rm[1] +gitlink:git-reset[1] gitlink:git-mv[1] gitlink:git-commit[1] gitlink:git-update-index[1] diff --git a/git-am.html b/git-am.html index 3003ab28a5..1d91bb487e 100644 --- a/git-am.html +++ b/git-am.html @@ -509,7 +509,7 @@ names.

diff --git a/git-annotate.html b/git-annotate.html index 87f4beb0dd..82ade03486 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -454,7 +454,7 @@ commit.

diff --git a/git-apply.html b/git-apply.html index 0633493505..ab60b25d21 100644 --- a/git-apply.html +++ b/git-apply.html @@ -599,7 +599,7 @@ subdirectory is checked and (if possible) updated.

diff --git a/git-archimport.html b/git-archimport.html index 93dcd487e4..cb85d21da5 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -422,7 +422,7 @@ patches that have been traded out-of-sequence between the branches.

diff --git a/git-archive.html b/git-archive.html index 437210699c..87f46f83d8 100644 --- a/git-archive.html +++ b/git-archive.html @@ -469,7 +469,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-d diff --git a/git-bisect.html b/git-bisect.html index 87f8c16653..3bbb493d18 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -445,7 +445,7 @@ know the outcome.

diff --git a/git-blame.html b/git-blame.html index fbe40892f1..141de8bc29 100644 --- a/git-blame.html +++ b/git-blame.html @@ -686,7 +686,7 @@ commit commentary), a blame viewer won't ever care. diff --git a/git-branch.html b/git-branch.html index d99bac8f5a..de381c0e4d 100644 --- a/git-branch.html +++ b/git-branch.html @@ -555,7 +555,7 @@ a branch and check it out with a single command.

diff --git a/git-bundle.html b/git-bundle.html index 81b8a827f7..eb66f40d4e 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -433,7 +433,7 @@ network.

diff --git a/git-cat-file.html b/git-cat-file.html index 546d0c880f..4a033d9525 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -366,7 +366,7 @@ be returned.

diff --git a/git-check-attr.html b/git-check-attr.html index c0e77e2bcd..d93730dca2 100644 --- a/git-check-attr.html +++ b/git-check-attr.html @@ -308,7 +308,7 @@ git-check-attr(1) Manual Page diff --git a/git-check-ref-format.html b/git-check-ref-format.html index 07143b04ca..f0a27facc9 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html @@ -343,7 +343,7 @@ colon : is used as in srcref:dstref to mean "use srcref's diff --git a/git-checkout-index.html b/git-checkout-index.html index 769b416203..f47b12949d 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -511,7 +511,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-checkout.html b/git-checkout.html index 7e3e2d0610..1956a5a02a 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -540,7 +540,7 @@ $ git add frotz diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 1aee1b041f..482aa2eca4 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -375,7 +375,7 @@ effect to your working tree in a row.

diff --git a/git-cherry.html b/git-cherry.html index 9024a8983e..a73e9eaa9c 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -356,7 +356,7 @@ than pushing or pulling commits directly.

diff --git a/git-citool.html b/git-citool.html index 405e673d4a..e7335dbe25 100644 --- a/git-citool.html +++ b/git-citool.html @@ -297,7 +297,7 @@ See git-gui(1) for more details.

diff --git a/git-clean.html b/git-clean.html index d612271899..7ea7f6230d 100644 --- a/git-clean.html +++ b/git-clean.html @@ -353,7 +353,7 @@ affected are further limited to those that match them.

diff --git a/git-clone.html b/git-clone.html index 2ee6ec2901..56fd4da611 100644 --- a/git-clone.html +++ b/git-clone.html @@ -641,7 +641,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-commit-tree.html b/git-commit-tree.html index b00a54311d..cea81645b2 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -477,7 +477,7 @@ reversible operation.

diff --git a/git-commit.html b/git-commit.html index 48283c0dd9..0283f709fb 100644 --- a/git-commit.html +++ b/git-commit.html @@ -511,10 +511,13 @@ that, you can recover from it with git-reset(1).

When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area -called the "index" with git-add(1). Removal -of a file is staged with git-rm(1). After building the -state to be committed incrementally with these commands, git -commit (without any pathname parameter) is used to record what +called the "index" with git-add(1). A file can be +reverted back, only in the index but not in the working tree, +to that of the last commit with git-reset HEAD — <file>, +which effectively reverts git-add and prevents the changes to +this file from participating in the next commit. After building +the state to be committed incrementally with these commands, +git commit (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:

@@ -701,7 +704,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index e54fb12103..d4bfd49ce1 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -154,10 +154,13 @@ EXAMPLES -------- When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area -called the "index" with gitlink:git-add[1]. Removal -of a file is staged with gitlink:git-rm[1]. After building the -state to be committed incrementally with these commands, `git -commit` (without any pathname parameter) is used to record what +called the "index" with gitlink:git-add[1]. A file can be +reverted back, only in the index but not in the working tree, +to that of the last commit with `git-reset HEAD -- `, +which effectively reverts `git-add` and prevents the changes to +this file from participating in the next commit. After building +the state to be committed incrementally with these commands, +`git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example: diff --git a/git-config.html b/git-config.html index 4e5ceddd99..6e6129aa16 100644 --- a/git-config.html +++ b/git-config.html @@ -1956,7 +1956,7 @@ transfer.unpackLimit diff --git a/git-count-objects.html b/git-count-objects.html index 9c142a2b2e..b464c9d2f0 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -309,7 +309,7 @@ them, to help you decide when it is a good time to repack.

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index 4d233fab38..fba91a80e3 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -412,7 +412,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit diff --git a/git-cvsimport.html b/git-cvsimport.html index c6dfc31c5b..f0fbb5778a 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -526,7 +526,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-cvsserver.html b/git-cvsserver.html index 360cb34d24..0832ebf3a4 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -691,7 +691,7 @@ Martin Langhoff <martin@catalyst.net.nz> diff --git a/git-daemon.html b/git-daemon.html index 596e2f2bd2..fb794a45a6 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -676,7 +676,7 @@ selectively enable/disable services per repository diff --git a/git-describe.html b/git-describe.html index 76b73a05e0..df05e6c399 100644 --- a/git-describe.html +++ b/git-describe.html @@ -428,7 +428,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

diff --git a/git-diff-files.html b/git-diff-files.html index f1fcd2ed69..7c905ea8c5 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -1114,7 +1114,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 5f29967a33..9459e420a3 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1196,7 +1196,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index a1448a5a05..b80da2dbee 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1584,7 +1584,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index 22a1cb03ff..7820ac28cc 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1311,7 +1311,7 @@ Output diff in reverse. diff --git a/git-fast-import.html b/git-fast-import.html index 22f72bd5cc..462a0da153 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -1309,7 +1309,7 @@ memory footprint (less than 2.7 MiB per active branch).

diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 25a62e4319..83a3b4f0a7 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -420,7 +420,7 @@ have a common ancestor commit.

diff --git a/git-fetch.html b/git-fetch.html index ee0cab446c..35161a71fa 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -664,7 +664,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-filter-branch.html b/git-filter-branch.html index 254fc57dbb..27971fb714 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -593,7 +593,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index e79841904d..545dbcab8f 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -349,7 +349,7 @@ merge.summary diff --git a/git-for-each-ref.html b/git-for-each-ref.html index 5ef1b8b563..4d3da00b0d 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -495,7 +495,7 @@ eval "$eval" diff --git a/git-format-patch.html b/git-format-patch.html index f757ca77a5..cbe28df3a7 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -979,7 +979,7 @@ git-format-patch -3 diff --git a/git-fsck-objects.html b/git-fsck-objects.html index c5017d7e3c..5154db95c9 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html @@ -281,7 +281,7 @@ documentation of that command.

diff --git a/git-fsck.html b/git-fsck.html index 2bf3dbdc3e..d225772a42 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -521,7 +521,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES diff --git a/git-gc.html b/git-gc.html index 8f1ed4cba4..579b394fe7 100644 --- a/git-gc.html +++ b/git-gc.html @@ -390,7 +390,7 @@ more details. This defaults to 10.

diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index cafd2be499..1633c6d56f 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html @@ -298,7 +298,7 @@ a tree ID instead of a commit ID or tag.

diff --git a/git-grep.html b/git-grep.html index d6121de6be..9f2bcd449d 100644 --- a/git-grep.html +++ b/git-grep.html @@ -528,7 +528,7 @@ revamped by Junio C Hamano.

diff --git a/git-gui.html b/git-gui.html index 56998f7f8e..6d7345b4f0 100644 --- a/git-gui.html +++ b/git-gui.html @@ -433,7 +433,7 @@ of end users.

diff --git a/git-hash-object.html b/git-hash-object.html index c403c5ac2e..a78e28fc66 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -327,7 +327,7 @@ specified, it defaults to "blob".

diff --git a/git-http-fetch.html b/git-http-fetch.html index 2e69f7229b..a513a01ca0 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -369,7 +369,7 @@ commit-id diff --git a/git-http-push.html b/git-http-push.html index 0b9e86393d..0f21b55b3c 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -420,7 +420,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-imap-send.html b/git-imap-send.html index e0e2f2a31a..592d8e8881 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -320,7 +320,7 @@ configuration file (shown with examples):

diff --git a/git-index-pack.html b/git-index-pack.html index ab1fcebe0b..f013f7bea2 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -398,7 +398,7 @@ mentioned above.

diff --git a/git-init-db.html b/git-init-db.html index 57668d4b61..16f19534e0 100644 --- a/git-init-db.html +++ b/git-init-db.html @@ -281,7 +281,7 @@ documentation of that command.

diff --git a/git-init.html b/git-init.html index b65c7e68d8..bbd44403ea 100644 --- a/git-init.html +++ b/git-init.html @@ -403,7 +403,7 @@ add all existing file to the index diff --git a/git-instaweb.html b/git-instaweb.html index ef8c51abe9..21b6cdc711 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -390,7 +390,7 @@ repository.

diff --git a/git-log.html b/git-log.html index 3f4b2c63ee..a078ac6594 100644 --- a/git-log.html +++ b/git-log.html @@ -853,7 +853,7 @@ reversible operation.

diff --git a/git-lost-found.html b/git-lost-found.html index b29fde6c0d..5adde3f841 100644 --- a/git-lost-found.html +++ b/git-lost-found.html @@ -340,7 +340,7 @@ $ git rev-parse not-lost-anymore diff --git a/git-ls-files.html b/git-ls-files.html index bb04e01ef4..8689cdee53 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -615,7 +615,7 @@ pattern file appears in.

diff --git a/git-ls-remote.html b/git-ls-remote.html index d50e493145..c2ae087e1e 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -361,7 +361,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 diff --git a/git-ls-tree.html b/git-ls-tree.html index ee38dd4497..9b778a5add 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -416,7 +416,7 @@ another major rewrite by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-mailinfo.html b/git-mailinfo.html index 434b112f06..bf5eeb697a 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -357,7 +357,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-mailsplit.html b/git-mailsplit.html index f2d52cfbff..a5866d8b93 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -362,7 +362,7 @@ and Junio C Hamano <junkio@cox.net>

diff --git a/git-merge-base.html b/git-merge-base.html index dcbfbf6788..f1b89045ee 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -312,7 +312,7 @@ relied on to decide in any particular way.

diff --git a/git-merge-file.html b/git-merge-file.html index a05b204412..a9af6464fa 100644 --- a/git-merge-file.html +++ b/git-merge-file.html @@ -377,7 +377,7 @@ with parts copied from the original documentation of RCS merge.

diff --git a/git-merge-index.html b/git-merge-index.html index ab6549c030..ca1597630d 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -372,7 +372,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz>

diff --git a/git-merge-one-file.html b/git-merge-one-file.html index d65d20ab30..e71100b69c 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -294,7 +294,7 @@ Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.

diff --git a/git-merge-tree.html b/git-merge-tree.html index eb62843dc4..6ffa7fc9ea 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -300,7 +300,7 @@ entries that match <branch1> tree.

diff --git a/git-merge.html b/git-merge.html index f96f3ae3cd..d075ef7692 100644 --- a/git-merge.html +++ b/git-merge.html @@ -648,7 +648,7 @@ Resolve the conflicts. git-diff would report only the diff --git a/git-mergetool.html b/git-mergetool.html index d2a24b8e2d..82c0cfaf72 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -321,7 +321,7 @@ is available in PATH.

diff --git a/git-mktag.html b/git-mktag.html index f29fe3a1dc..21667c451c 100644 --- a/git-mktag.html +++ b/git-mktag.html @@ -310,7 +310,7 @@ care about, but that can be verified with gpg.

diff --git a/git-mktree.html b/git-mktree.html index f71588b209..168d3f4767 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -307,7 +307,7 @@ built is written to the standard output.

diff --git a/git-mv.html b/git-mv.html index 1556fdf906..d27cfa80d3 100644 --- a/git-mv.html +++ b/git-mv.html @@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de> diff --git a/git-name-rev.html b/git-name-rev.html index b99606164c..38daaf49f5 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -364,7 +364,7 @@ not the context.

diff --git a/git-pack-objects.html b/git-pack-objects.html index 5048cf55b3..f7d3334bbe 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -563,7 +563,7 @@ base-name diff --git a/git-pack-redundant.html b/git-pack-redundant.html index e3f094c69a..3cb7d5221d 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -335,7 +335,7 @@ objects.

diff --git a/git-pack-refs.html b/git-pack-refs.html index 299f82de9b..6f325b23f9 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html @@ -336,7 +336,7 @@ hierarchy after packing them. This option tells it not to. diff --git a/git-parse-remote.html b/git-parse-remote.html index 5ea40b577d..fcbe82adb6 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html @@ -326,7 +326,7 @@ get_remote_refs_for_push diff --git a/git-patch-id.html b/git-patch-id.html index 17c5d208dd..080497c601 100644 --- a/git-patch-id.html +++ b/git-patch-id.html @@ -314,7 +314,7 @@ This can be used to make a mapping from patch ID to commit ID.

diff --git a/git-peek-remote.html b/git-peek-remote.html index 7c9b8f57c6..a1418c2c4f 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -341,7 +341,7 @@ stores them in the local repository under the same name.

diff --git a/git-prune-packed.html b/git-prune-packed.html index ccd8337738..c6a5084bf1 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -325,7 +325,7 @@ disk storage, etc.

diff --git a/git-prune.html b/git-prune.html index e7efc277e6..23c6013a2b 100644 --- a/git-prune.html +++ b/git-prune.html @@ -340,7 +340,7 @@ borrows from your repository via its diff --git a/git-pull.html b/git-pull.html index 7139b9dd38..10ccb0c090 100644 --- a/git-pull.html +++ b/git-pull.html @@ -946,7 +946,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-push.html b/git-push.html index ce1e8ee726..74d5d3cddc 100644 --- a/git-push.html +++ b/git-push.html @@ -621,7 +621,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-quiltimport.html b/git-quiltimport.html index e29c821c9e..c089aec773 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -339,7 +339,7 @@ variable.

diff --git a/git-read-tree.html b/git-read-tree.html index f4cc88d5ab..409c5b5684 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -711,7 +711,7 @@ have finished your work-in-progress), attempt the merge again.

diff --git a/git-rebase.html b/git-rebase.html index d746f3091c..9ce2fcdafc 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -831,7 +831,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

diff --git a/git-receive-pack.html b/git-receive-pack.html index 7cc334516b..e5f89e6e49 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html @@ -430,7 +430,7 @@ exec git-update-server-info diff --git a/git-reflog.html b/git-reflog.html index 8c0db1b1e1..37887a1269 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -369,7 +369,7 @@ them.

diff --git a/git-relink.html b/git-relink.html index 967aef4417..f1fc86dfbf 100644 --- a/git-relink.html +++ b/git-relink.html @@ -315,7 +315,7 @@ if they are hardlinked, and replace one with a hardlink to the other if not.

diff --git a/git-remote.html b/git-remote.html index 67017358db..c4e6d9364b 100644 --- a/git-remote.html +++ b/git-remote.html @@ -353,7 +353,7 @@ caution.

Fetch updates for a named set of remotes in the repository as defined by remotes.<group>. If a named group is not specified on the command line, the configuration parameter remotes.default will get used; if -remotes.default is not defined, all remotes which do not the +remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated. (See git-config(1)).

@@ -428,7 +428,7 @@ $ git merge origin diff --git a/git-remote.txt b/git-remote.txt index 027ba11bdb..0da8704a25 100644 --- a/git-remote.txt +++ b/git-remote.txt @@ -79,7 +79,7 @@ caution. Fetch updates for a named set of remotes in the repository as defined by remotes.. If a named group is not specified on the command line, the configuration parameter remotes.default will get used; if -remotes.default is not defined, all remotes which do not the +remotes.default is not defined, all remotes which do not have the configuration parameter remote..skipDefaultUpdate set to true will be updated. (See gitlink:git-config[1]). diff --git a/git-repack.html b/git-repack.html index e5cbebf7d2..a2729a219b 100644 --- a/git-repack.html +++ b/git-repack.html @@ -423,7 +423,7 @@ that way can try to use older git with it).

diff --git a/git-repo-config.html b/git-repo-config.html index c5ec47fdac..80d9751b2c 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -281,7 +281,7 @@ documentation of that command.

diff --git a/git-request-pull.html b/git-request-pull.html index b80d074a49..6334f995cc 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -322,7 +322,7 @@ the given URL in the generated summary.

diff --git a/git-rerere.html b/git-rerere.html index d5e936c6b5..9808550216 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -481,7 +481,7 @@ conflict.

diff --git a/git-reset.html b/git-reset.html index 77803c1ef1..368914a72b 100644 --- a/git-reset.html +++ b/git-reset.html @@ -575,7 +575,7 @@ At this point the index file still has all the WIP changes you diff --git a/git-rev-list.html b/git-rev-list.html index 36d93a3c7a..e1664baeb3 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1162,7 +1162,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-parse.html b/git-rev-parse.html index 72c4d4b602..dc0dd6ea85 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -738,7 +738,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-revert.html b/git-revert.html index 56562a3759..a6a4bcfcc8 100644 --- a/git-revert.html +++ b/git-revert.html @@ -357,7 +357,7 @@ effect to your working tree in a row.

diff --git a/git-rm.html b/git-rm.html index 6e063c6e16..e4e3e885bc 100644 --- a/git-rm.html +++ b/git-rm.html @@ -415,7 +415,7 @@ git-rm -f git-*.sh diff --git a/git-runstatus.html b/git-runstatus.html index 2f995167d4..95c1e6a7da 100644 --- a/git-runstatus.html +++ b/git-runstatus.html @@ -355,7 +355,7 @@ of git-commit, and later rewritten in C by Jeff King.

diff --git a/git-send-email.html b/git-send-email.html index 49ee64e726..e78ce00f9e 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -616,7 +616,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-pack.html b/git-send-pack.html index c61d22bd63..62e233309d 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -451,7 +451,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-sh-setup.html b/git-sh-setup.html index 62c3335959..5ec31aa59b 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html @@ -364,7 +364,7 @@ require_work_tree diff --git a/git-shell.html b/git-shell.html index 2aaf7cb34d..afe2342c18 100644 --- a/git-shell.html +++ b/git-shell.html @@ -298,7 +298,7 @@ are permitted to be called, with a single required argument.

diff --git a/git-shortlog.html b/git-shortlog.html index 346238ea23..1520e34a27 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -344,7 +344,7 @@ Eve Jones <eve@laptop.(none)> diff --git a/git-show-branch.html b/git-show-branch.html index dcb53ed8b5..cd7b9f06e1 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -521,7 +521,7 @@ topologically related with each other.

diff --git a/git-show-index.html b/git-show-index.html index e4d68ea286..766a3b4407 100644 --- a/git-show-index.html +++ b/git-show-index.html @@ -296,7 +296,7 @@ offset and SHA1 of each object.

diff --git a/git-show-ref.html b/git-show-ref.html index 60e634482c..aea2f92cce 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -460,7 +460,7 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.

diff --git a/git-show.html b/git-show.html index a8dcc1b35a..1e0834b2de 100644 --- a/git-show.html +++ b/git-show.html @@ -762,7 +762,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

diff --git a/git-stash.html b/git-stash.html index ecb21c1df8..38a6a9ef38 100644 --- a/git-stash.html +++ b/git-stash.html @@ -460,7 +460,7 @@ $ git stash apply diff --git a/git-status.html b/git-status.html index 821aa2b24e..4cc94edc23 100644 --- a/git-status.html +++ b/git-status.html @@ -326,7 +326,7 @@ Junio C Hamano <junkio@cox.net>.

diff --git a/git-stripspace.html b/git-stripspace.html index 6715d85fcf..7d61683ec4 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -313,7 +313,7 @@ git-stripspace(1) Manual Page diff --git a/git-submodule.html b/git-submodule.html index cd645cd4fc..834925a941 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -388,7 +388,7 @@ to each submodule url is "submodule.$name.url".

diff --git a/git-svn.html b/git-svn.html index d0b9c852c5..1bb68bd135 100644 --- a/git-svn.html +++ b/git-svn.html @@ -1060,7 +1060,7 @@ should be manually entered with a text-editor or using diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index d922ccf4cc..fdd842dceb 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -336,7 +336,7 @@ name is not a symbolic ref, or 128 if another error occurs.

diff --git a/git-tag.html b/git-tag.html index fabdaea085..aa9d8801df 100644 --- a/git-tag.html +++ b/git-tag.html @@ -544,7 +544,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.< diff --git a/git-tar-tree.html b/git-tar-tree.html index b9d0f52858..ad00baf005 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html @@ -399,7 +399,7 @@ git tar-tree HEAD:Documentation/ git-docs > git-1.4.0-docs.tar diff --git a/git-tools.html b/git-tools.html index 0e4bdcb63e..044ad0212c 100644 --- a/git-tools.html +++ b/git-tools.html @@ -438,7 +438,7 @@ comprehensive list.

diff --git a/git-unpack-file.html b/git-unpack-file.html index 3e51ac2d18..a9afa78db8 100644 --- a/git-unpack-file.html +++ b/git-unpack-file.html @@ -307,7 +307,7 @@ returns the name of the temporary file in the following format: diff --git a/git-unpack-objects.html b/git-unpack-objects.html index 50660ad9b7..9c20aa0d2b 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html @@ -333,7 +333,7 @@ new packs and replace existing ones.

diff --git a/git-update-index.html b/git-update-index.html index ad5c8dfc7a..205e200b1b 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -721,7 +721,7 @@ from symbolic link to regular file.

diff --git a/git-update-ref.html b/git-update-ref.html index b0cd48d251..a0b558c4c4 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -360,7 +360,7 @@ or does not have committer information available.

diff --git a/git-update-server-info.html b/git-update-server-info.html index c90158ff7e..1f9658b46c 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -332,7 +332,7 @@ info/refs file unless --force flag is given.

diff --git a/git-upload-archive.html b/git-upload-archive.html index 7e5650f1eb..a49ca17450 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html @@ -309,7 +309,7 @@ is meant to be used to get an archive from a remote repository.

diff --git a/git-upload-pack.html b/git-upload-pack.html index ae61398025..2353f8b218 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -326,7 +326,7 @@ repository. For push operations, see git-send-pack.

diff --git a/git-var.html b/git-var.html index ea5d779de8..478086bfa4 100644 --- a/git-var.html +++ b/git-var.html @@ -372,7 +372,7 @@ Your sysadmin must hate you! diff --git a/git-verify-pack.html b/git-verify-pack.html index 79120e0a55..fbec556381 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -338,7 +338,7 @@ corresponding pack file.

diff --git a/git-verify-tag.html b/git-verify-tag.html index 7a1b9ca5b9..ebb9a6955e 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -305,7 +305,7 @@ git-verify-tag(1) Manual Page diff --git a/git-whatchanged.html b/git-whatchanged.html index 1adf291513..9aad4b3980 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -384,7 +384,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-write-tree.html b/git-write-tree.html index be7d014e61..a85be4f386 100644 --- a/git-write-tree.html +++ b/git-write-tree.html @@ -323,7 +323,7 @@ now, you need to have done a git-update-index phase before you did the diff --git a/git.html b/git.html index 78bf0c3279..b539258433 100644 --- a/git.html +++ b/git.html @@ -1925,7 +1925,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/gitattributes.html b/gitattributes.html index b9f30121dc..c5061f0c1e 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -420,19 +420,20 @@ sign $ upon checkout. Any byte sequence that begins with $Id: and ends with $ in the worktree file is replaced with $Id$ upon check-in.

filter

-

A filter attribute can be set to a string value. This names +

A filter attribute can be set to a string value that names a filter driver specified in the configuration.

-

A filter driver consists of clean command and smudge +

A filter driver consists of a clean command and a smudge command, either of which can be left unspecified. Upon -checkout, when smudge command is specified, the command is fed -the blob object from its standard input, and its standard output -is used to update the worktree file. Similarly, clean command -is used to convert the contents of worktree file upon checkin.

-

Missing filter driver definition in the config is not an error +checkout, when the smudge command is specified, the command is +fed the blob object from its standard input, and its standard +output is used to update the worktree file. Similarly, the +clean command is used to convert the contents of worktree file +upon checkin.

+

A missing filter driver definition in the config is not an error but makes the filter a no-op passthru.

The content filtering is done to massage the content into a shape that is more convenient for the platform, filesystem, and -the user to use. The keyword here is "more convenient" and not +the user to use. The key phrase here is "more convenient" and not "turning something unusable into usable". In other words, the intent is that if someone unsets the filter driver definition, or does not have the appropriate filter program, the project @@ -702,7 +703,7 @@ commit hash.

diff --git a/gitattributes.txt b/gitattributes.txt index 20cf8ff816..19bd25f299 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -148,22 +148,23 @@ with `$Id$` upon check-in. `filter` ^^^^^^^^ -A `filter` attribute can be set to a string value. This names +A `filter` attribute can be set to a string value that names a filter driver specified in the configuration. -A filter driver consists of `clean` command and `smudge` +A filter driver consists of a `clean` command and a `smudge` command, either of which can be left unspecified. Upon -checkout, when `smudge` command is specified, the command is fed -the blob object from its standard input, and its standard output -is used to update the worktree file. Similarly, `clean` command -is used to convert the contents of worktree file upon checkin. +checkout, when the `smudge` command is specified, the command is +fed the blob object from its standard input, and its standard +output is used to update the worktree file. Similarly, the +`clean` command is used to convert the contents of worktree file +upon checkin. -Missing filter driver definition in the config is not an error +A missing filter driver definition in the config is not an error but makes the filter a no-op passthru. The content filtering is done to massage the content into a shape that is more convenient for the platform, filesystem, and -the user to use. The keyword here is "more convenient" and not +the user to use. The key phrase here is "more convenient" and not "turning something unusable into usable". In other words, the intent is that if someone unsets the filter driver definition, or does not have the appropriate filter program, the project diff --git a/gitignore.html b/gitignore.html index 081751682d..88a646fa7d 100644 --- a/gitignore.html +++ b/gitignore.html @@ -412,7 +412,7 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.

diff --git a/gitk.html b/gitk.html index 178f10d458..e495fb8603 100644 --- a/gitk.html +++ b/gitk.html @@ -425,7 +425,7 @@ gitk --max-count=100 --all -- Makefile diff --git a/gitmodules.html b/gitmodules.html index 15dd32dc45..594ae1e85b 100644 --- a/gitmodules.html +++ b/gitmodules.html @@ -337,7 +337,7 @@ submodules an url is specified which can be used for cloning the submodules.

diff --git a/glossary.html b/glossary.html index 359062a4b9..768dac7375 100644 --- a/glossary.html +++ b/glossary.html @@ -1080,7 +1080,7 @@ This commit is referred to as a "merge commit", or sometimes just a diff --git a/hooks.html b/hooks.html index 5a3fb8c5f1..674c151f01 100644 --- a/hooks.html +++ b/hooks.html @@ -479,7 +479,7 @@ for the user.

diff --git a/howto-index.html b/howto-index.html index 182c0c3415..ae4766e5d1 100644 --- a/howto-index.html +++ b/howto-index.html @@ -350,7 +350,7 @@ into which branch and who can make a tag.

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 9607cc08dd..e343314bcf 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -434,7 +434,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/repository-layout.html b/repository-layout.html index ecf527c04a..3ea1abbe34 100644 --- a/repository-layout.html +++ b/repository-layout.html @@ -582,7 +582,7 @@ shallow diff --git a/tutorial-2.html b/tutorial-2.html index 7ec6913b25..03bcf50808 100644 --- a/tutorial-2.html +++ b/tutorial-2.html @@ -647,7 +647,7 @@ example, creating a new commit.

diff --git a/tutorial.html b/tutorial.html index dca03ad947..32c594906b 100644 --- a/tutorial.html +++ b/tutorial.html @@ -786,7 +786,7 @@ digressions that may be interesting at this point are:

diff --git a/user-manual.html b/user-manual.html index ba2206df94..6bd0eeb05d 100644 --- a/user-manual.html +++ b/user-manual.html @@ -236,7 +236,7 @@ Bisecting: 3537 revisions left to test after this
[65934a9a028b88e83e2b0f8b36618fe503349f8e] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #6]

If you run "git branch" at this point, you'll see that git has temporarily moved you to a new branch named "bisect". This branch points to a commit (with commit id 65934…) that is reachable from -v2.6.19 but not from v2.6.18. Compile and test it, and see whether +"master" but not from v2.6.18. Compile and test it, and see whether it crashes. Assume it does crash. Then:

$ git bisect bad
Bisecting: 1769 revisions left to test after this
[7eff82c8b1511017ae605f0c99ac275a7e21b867] i2c-core: Drop useless bitmaskings

checks out an older version. Continue like this, telling git at each @@ -616,8 +616,8 @@ other git operations are in progress in the same repository.

Fortunately, git also keeps a log, called a "reflog", of all the previous values of each branch. So in this case you can still find the -old history using, for example,

$ git log master@{1}

This lists the commits reachable from the previous version of the head. -This syntax can be used to with any git command that accepts a commit, +old history using, for example,

$ git log master@{1}

This lists the commits reachable from the previous version of the branch. +This syntax can be used with any git command that accepts a commit, not just with git log. Some other examples:

$ git show master@{2}           # See where the branch pointed 2,
$ git show master@{3}           # 3, ... changes ago.
$ gitk master@{yesterday}       # See where it pointed yesterday,
diff --git a/user-manual.txt b/user-manual.txt index d99adc6f72..60e13853dc 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -475,7 +475,7 @@ Bisecting: 3537 revisions left to test after this If you run "git branch" at this point, you'll see that git has temporarily moved you to a new branch named "bisect". This branch points to a commit (with commit id 65934...) that is reachable from -v2.6.19 but not from v2.6.18. Compile and test it, and see whether +"master" but not from v2.6.18. Compile and test it, and see whether it crashes. Assume it does crash. Then: ------------------------------------------------- @@ -1567,8 +1567,8 @@ old history using, for example, $ git log master@{1} ------------------------------------------------- -This lists the commits reachable from the previous version of the head. -This syntax can be used to with any git command that accepts a commit, +This lists the commits reachable from the previous version of the branch. +This syntax can be used with any git command that accepts a commit, not just with git log. Some other examples: ------------------------------------------------- -- 2.34.1