From 73d812ca2a8cff55e5ebb8a11b6f7d0496bba62c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 1 Jul 2009 02:33:06 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.3.3-363-g725cf --- everyday.html | 2 +- git-add.html | 2 +- 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 | 2 +- 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-difftool.html | 2 +- git-fast-export.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-help.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--lib.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 | 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-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-stage.html | 2 +- git-stash.html | 2 +- git-status.html | 2 +- git-stripspace.html | 2 +- git-submodule.html | 7 ++++--- git-submodule.txt | 5 +++-- 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-web--browse.html | 2 +- git-whatchanged.html | 2 +- git-write-tree.html | 2 +- git.html | 2 +- gitattributes.html | 2 +- gitcli.html | 2 +- gitcore-tutorial.html | 2 +- gitcvs-migration.html | 2 +- gitdiffcore.html | 2 +- gitglossary.html | 2 +- githooks.html | 2 +- gitignore.html | 2 +- gitk.html | 2 +- gitmodules.html | 2 +- gitrepository-layout.html | 2 +- gittutorial-2.html | 2 +- gittutorial.html | 26 +++++++++++++------------- gittutorial.txt | 24 ++++++++++++------------ gitworkflows.html | 2 +- howto-index.html | 2 +- howto/revert-branch-rebase.html | 2 +- howto/using-merge-subtree.html | 2 +- technical/api-allocation-growing.html | 2 +- technical/api-builtin.html | 2 +- technical/api-decorate.html | 2 +- technical/api-diff.html | 2 +- technical/api-directory-listing.html | 2 +- technical/api-gitattributes.html | 2 +- technical/api-grep.html | 2 +- technical/api-hash.html | 2 +- technical/api-history-graph.html | 2 +- technical/api-in-core-index.html | 2 +- technical/api-index.html | 2 +- technical/api-lockfile.html | 2 +- technical/api-object-access.html | 2 +- technical/api-parse-options.html | 2 +- technical/api-quote.html | 2 +- technical/api-remote.html | 2 +- technical/api-revision-walking.html | 2 +- technical/api-run-command.html | 2 +- technical/api-setup.html | 2 +- technical/api-strbuf.html | 2 +- technical/api-string-list.html | 2 +- technical/api-tree-walking.html | 2 +- technical/api-xdiff-interface.html | 2 +- user-manual.html | 2 +- 179 files changed, 207 insertions(+), 205 deletions(-) diff --git a/everyday.html b/everyday.html index a19cea88e8..2e2ab860d1 100644 --- a/everyday.html +++ b/everyday.html @@ -1098,7 +1098,7 @@ upload to public HTTP server hosted by your ISP. diff --git a/git-add.html b/git-add.html index ac408c1ee0..a835e2650f 100644 --- a/git-add.html +++ b/git-add.html @@ -710,7 +710,7 @@ diff diff --git a/git-am.html b/git-am.html index 4c5cde0d00..7b84d4b146 100644 --- a/git-am.html +++ b/git-am.html @@ -598,7 +598,7 @@ errors in the "From:" lines).

diff --git a/git-annotate.html b/git-annotate.html index 9cffbbea85..c08e6291bc 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -549,7 +549,7 @@ commit.

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

diff --git a/git-archimport.html b/git-archimport.html index 86bb60603a..ae850ad80c 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -470,7 +470,7 @@ patches that have been traded out-of-sequence between the branches.

diff --git a/git-archive.html b/git-archive.html index 22cda7f8d7..cdb1d71984 100644 --- a/git-archive.html +++ b/git-archive.html @@ -568,7 +568,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 d9c5a7a540..d10dcece6c 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -600,7 +600,7 @@ $ git bisect run sh -c "make || exit 125; ~/check_test_case.sh" diff --git a/git-blame.html b/git-blame.html index 3c21523c3d..bb38215b3b 100644 --- a/git-blame.html +++ b/git-blame.html @@ -857,7 +857,7 @@ the email address.

diff --git a/git-branch.html b/git-branch.html index edc867c680..9ec9e993b5 100644 --- a/git-branch.html +++ b/git-branch.html @@ -672,7 +672,7 @@ but different purposes:

diff --git a/git-bundle.html b/git-bundle.html index 97ecbcf6b1..ba2249b5f7 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -535,7 +535,7 @@ references when fetching:

diff --git a/git-cat-file.html b/git-cat-file.html index 1b3ac24bcb..27580fc249 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -455,7 +455,7 @@ for each object specified on stdin that does not exist in the repository:

diff --git a/git-check-attr.html b/git-check-attr.html index c494be787b..5248d87f8f 100644 --- a/git-check-attr.html +++ b/git-check-attr.html @@ -481,7 +481,7 @@ README: caveat: unspecified diff --git a/git-check-ref-format.html b/git-check-ref-format.html index 2377cb27ce..8e79ffbaa5 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html @@ -437,7 +437,7 @@ Print the name of the previous branch. diff --git a/git-checkout-index.html b/git-checkout-index.html index b9ef6226b0..99553fee7b 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -574,7 +574,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-checkout.html b/git-checkout.html index d58a867c58..bacc895098 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -652,7 +652,7 @@ $ git add frotz diff --git a/git-cherry-pick.html b/git-cherry-pick.html index f6b96f4dce..e733ffb28c 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -442,7 +442,7 @@ effect to your index in a row.

diff --git a/git-cherry.html b/git-cherry.html index 9bcfd7774a..30a3d71b69 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -411,7 +411,7 @@ than pushing or pulling commits directly.

diff --git a/git-citool.html b/git-citool.html index 921283518f..a4fb939d54 100644 --- a/git-citool.html +++ b/git-citool.html @@ -345,7 +345,7 @@ See git-gui(1) for more details.

diff --git a/git-clean.html b/git-clean.html index eb008e0ac1..28a3f0f333 100644 --- a/git-clean.html +++ b/git-clean.html @@ -408,7 +408,7 @@ are affected.

diff --git a/git-clone.html b/git-clone.html index 90d487a82b..e85e4d65bc 100644 --- a/git-clone.html +++ b/git-clone.html @@ -735,7 +735,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 a427dc6b84..09711640cd 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -525,7 +525,7 @@ reversible operation.

diff --git a/git-commit.html b/git-commit.html index 62898d0600..f85fa3d13a 100644 --- a/git-commit.html +++ b/git-commit.html @@ -868,7 +868,7 @@ Junio C Hamano <gitster@pobox.com>

diff --git a/git-config.html b/git-config.html index 292ef3d16a..a19f02c2b8 100644 --- a/git-config.html +++ b/git-config.html @@ -3336,7 +3336,7 @@ web.browser diff --git a/git-count-objects.html b/git-count-objects.html index 8007a863a1..0ab0261bc6 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -361,7 +361,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 91ebd70a83..e7943e4123 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -514,7 +514,7 @@ $ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit diff --git a/git-cvsimport.html b/git-cvsimport.html index 797417e802..ac4c2d37e2 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -653,7 +653,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-cvsserver.html b/git-cvsserver.html index 33917fed9f..6280c2da92 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -785,7 +785,7 @@ Martin Langhoff <martin@catalyst.net.nz> diff --git a/git-daemon.html b/git-daemon.html index 730913e60b..6368cb7744 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -753,7 +753,7 @@ services are performed.

diff --git a/git-describe.html b/git-describe.html index 7d27215668..13b8a9194f 100644 --- a/git-describe.html +++ b/git-describe.html @@ -523,7 +523,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

diff --git a/git-diff-files.html b/git-diff-files.html index 9e21e0626f..cbc6f0014d 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -1410,7 +1410,7 @@ the pathname, but if that is NUL, the record will show two paths.

diff --git a/git-diff-index.html b/git-diff-index.html index e63130a095..5ed10db53b 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1488,7 +1488,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index eb6c7da3d0..156da7d6e4 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1969,7 +1969,7 @@ the pathname, but if that is NUL, the record will show two paths.

diff --git a/git-diff.html b/git-diff.html index 21d846700f..5c3f36b44f 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1604,7 +1604,7 @@ Output diff in reverse. diff --git a/git-difftool.html b/git-difftool.html index 935c2d6b45..d80be5c33c 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -474,7 +474,7 @@ difftool.prompt diff --git a/git-fast-export.html b/git-fast-export.html index 2390815e15..dd4260e1fc 100644 --- a/git-fast-export.html +++ b/git-fast-export.html @@ -454,7 +454,7 @@ a tag referencing a tree instead of a commit.

diff --git a/git-fast-import.html b/git-fast-import.html index aa36f207ff..491f2eb1e8 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -1471,7 +1471,7 @@ memory footprint (less than 2.7 MiB per active branch).

diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 7dcfde6c67..fe835a670f 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -485,7 +485,7 @@ have a common ancestor commit.

diff --git a/git-fetch.html b/git-fetch.html index d6c97d9dfe..9097984e6d 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -789,7 +789,7 @@ Junio C Hamano <gitster@pobox.com>

diff --git a/git-filter-branch.html b/git-filter-branch.html index 5b2bac2c26..bc8e9fc551 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -762,7 +762,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 099cd4ec51..5cc3892e40 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -421,7 +421,7 @@ merge.summary diff --git a/git-for-each-ref.html b/git-for-each-ref.html index b6629c2cfa..6b8b127a83 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -566,7 +566,7 @@ eval "$eval" diff --git a/git-format-patch.html b/git-format-patch.html index 885849ecd3..441fda8992 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -1203,7 +1203,7 @@ as e-mailable patches: diff --git a/git-fsck-objects.html b/git-fsck-objects.html index 31ec148bac..217423b7f3 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html @@ -329,7 +329,7 @@ documentation of that command.

diff --git a/git-fsck.html b/git-fsck.html index 3f54fdb26d..4128a4632e 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -571,7 +571,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES diff --git a/git-gc.html b/git-gc.html index 782ad50f1d..8ecdf666e0 100644 --- a/git-gc.html +++ b/git-gc.html @@ -469,7 +469,7 @@ remove those references.

diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 8df59e4063..0d94113e20 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html @@ -346,7 +346,7 @@ a tree ID instead of a commit ID or tag.

diff --git a/git-grep.html b/git-grep.html index cea318a202..2907581008 100644 --- a/git-grep.html +++ b/git-grep.html @@ -660,7 +660,7 @@ revamped by Junio C Hamano.

diff --git a/git-gui.html b/git-gui.html index 5921329c82..f974f775c2 100644 --- a/git-gui.html +++ b/git-gui.html @@ -512,7 +512,7 @@ of end users.

diff --git a/git-hash-object.html b/git-hash-object.html index d0709bd5a5..c17bf3d554 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -411,7 +411,7 @@ specified, it defaults to "blob".

diff --git a/git-help.html b/git-help.html index 7c19b9a534..d371d3b4ef 100644 --- a/git-help.html +++ b/git-help.html @@ -523,7 +523,7 @@ little. Maintenance is done by the git-list <git@vger.kernel.org>.

diff --git a/git-http-fetch.html b/git-http-fetch.html index c11ba0faf3..8f0a1c1c46 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -417,7 +417,7 @@ commit-id diff --git a/git-http-push.html b/git-http-push.html index 138d1a1b0c..bdcadf911c 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -474,7 +474,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-imap-send.html b/git-imap-send.html index 8590770782..4c6c78ca6b 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -476,7 +476,7 @@ users may wish to visit this web page for more information: diff --git a/git-index-pack.html b/git-index-pack.html index 440dfc6090..22c5376c81 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -454,7 +454,7 @@ mentioned above.

diff --git a/git-init-db.html b/git-init-db.html index ee677b3ec0..add93a2796 100644 --- a/git-init-db.html +++ b/git-init-db.html @@ -329,7 +329,7 @@ documentation of that command.

diff --git a/git-init.html b/git-init.html index 247cf9c081..382e4eb504 100644 --- a/git-init.html +++ b/git-init.html @@ -478,7 +478,7 @@ add all existing file to the index diff --git a/git-instaweb.html b/git-instaweb.html index d82d229b3f..690c13fe0b 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -458,7 +458,7 @@ repository.

diff --git a/git-log.html b/git-log.html index 002f88d115..fa9e40bbea 100644 --- a/git-log.html +++ b/git-log.html @@ -2414,7 +2414,7 @@ reversible operation.

diff --git a/git-lost-found.html b/git-lost-found.html index 4e6ef9ad33..152c0bc8e3 100644 --- a/git-lost-found.html +++ b/git-lost-found.html @@ -388,7 +388,7 @@ $ git rev-parse not-lost-anymore diff --git a/git-ls-files.html b/git-ls-files.html index e91b1245ba..9a7154e177 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -704,7 +704,7 @@ pattern file appears in.

diff --git a/git-ls-remote.html b/git-ls-remote.html index f047b03208..108768e8a0 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -421,7 +421,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 diff --git a/git-ls-tree.html b/git-ls-tree.html index dc793fd713..5a2c37ff8f 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -495,7 +495,7 @@ another major rewrite by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-mailinfo.html b/git-mailinfo.html index 7b9bf79137..aac9df2c54 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -413,7 +413,7 @@ Junio C Hamano <gitster@pobox.com>

diff --git a/git-mailsplit.html b/git-mailsplit.html index 637678da42..87e1f43add 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -410,7 +410,7 @@ and Junio C Hamano <gitster@pobox.com>

diff --git a/git-merge-base.html b/git-merge-base.html index 8ec1fb9675..19ce892c23 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -414,7 +414,7 @@ it is unspecified which best one is output.

diff --git a/git-merge-file.html b/git-merge-file.html index 45b1bf5952..897d7e769a 100644 --- a/git-merge-file.html +++ b/git-merge-file.html @@ -425,7 +425,7 @@ with parts copied from the original documentation of RCS merge.

diff --git a/git-merge-index.html b/git-merge-index.html index ac9945c969..2fff5e5056 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -420,7 +420,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 0e10857f53..3f11f1fbca 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -342,7 +342,7 @@ Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.< diff --git a/git-merge-tree.html b/git-merge-tree.html index 838725f3b4..0771aa8e26 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -348,7 +348,7 @@ entries that match the <branch1> tree.

diff --git a/git-merge.html b/git-merge.html index fced951ac1..7b0215d1dd 100644 --- a/git-merge.html +++ b/git-merge.html @@ -922,7 +922,7 @@ Look at the originals. git show :1:filename shows the diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index 03c36c09e2..beba131262 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html @@ -388,7 +388,7 @@ run_merge_tool diff --git a/git-mergetool.html b/git-mergetool.html index 95481ba34d..5affce771b 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -414,7 +414,7 @@ success of the resolution after the custom tool has exited.

diff --git a/git-mktag.html b/git-mktag.html index 4377fb0ed5..9318a55cbc 100644 --- a/git-mktag.html +++ b/git-mktag.html @@ -358,7 +358,7 @@ care about, but that can be verified with gpg.

diff --git a/git-mktree.html b/git-mktree.html index 17d8aeb5ee..09276c95a0 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -378,7 +378,7 @@ built is written to the standard output.

diff --git a/git-mv.html b/git-mv.html index e92d08baf3..916138387b 100644 --- a/git-mv.html +++ b/git-mv.html @@ -388,7 +388,7 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de> diff --git a/git-name-rev.html b/git-name-rev.html index 50de9a2880..0b422c23c7 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -428,7 +428,7 @@ not the context.

diff --git a/git-pack-objects.html b/git-pack-objects.html index d1b44a5e4a..9e8ce808b4 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -638,7 +638,7 @@ base-name diff --git a/git-pack-redundant.html b/git-pack-redundant.html index c5297d2fff..19b668d560 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -383,7 +383,7 @@ objects.

diff --git a/git-pack-refs.html b/git-pack-refs.html index 03fd54112a..b6e3d9094c 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html @@ -384,7 +384,7 @@ hierarchy after packing them. This option tells it not to. diff --git a/git-parse-remote.html b/git-parse-remote.html index 434fc6f15c..d9c85e7cd0 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html @@ -343,7 +343,7 @@ to fetching, pulling and pushing.

diff --git a/git-patch-id.html b/git-patch-id.html index 9f63f988a3..305383b92b 100644 --- a/git-patch-id.html +++ b/git-patch-id.html @@ -362,7 +362,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 a9ff6ac33d..57ce5eccb5 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -380,7 +380,7 @@ git-peek-remote(1) Manual Page diff --git a/git-prune-packed.html b/git-prune-packed.html index 06c1b184dd..56a2b4d37b 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -373,7 +373,7 @@ disk storage, etc.

diff --git a/git-prune.html b/git-prune.html index 60d8130d3f..91c74e3cb7 100644 --- a/git-prune.html +++ b/git-prune.html @@ -429,7 +429,7 @@ many other housekeeping tasks.

diff --git a/git-pull.html b/git-pull.html index d7b5eebf0d..9ca57a4a7a 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1180,7 +1180,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-push.html b/git-push.html index e27e34a3ba..b999af1f5f 100644 --- a/git-push.html +++ b/git-push.html @@ -921,7 +921,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-quiltimport.html b/git-quiltimport.html index a942eccde6..40ea76d14f 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -390,7 +390,7 @@ variable.

diff --git a/git-read-tree.html b/git-read-tree.html index b278544cdb..e39f30fae6 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -776,7 +776,7 @@ have finished your work-in-progress), attempt the merge again.

diff --git a/git-rebase.html b/git-rebase.html index 8cbc77630f..d099a0777c 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1116,7 +1116,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

diff --git a/git-receive-pack.html b/git-receive-pack.html index c17cdec30e..32a9cff9a9 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html @@ -478,7 +478,7 @@ exec git update-server-info diff --git a/git-reflog.html b/git-reflog.html index 5e1422c534..21d6e0ab30 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -447,7 +447,7 @@ them.

diff --git a/git-relink.html b/git-relink.html index ea2871895e..182e21c887 100644 --- a/git-relink.html +++ b/git-relink.html @@ -364,7 +364,7 @@ repository will be replaced with a hardlink to the master repository.

diff --git a/git-remote.html b/git-remote.html index 4f27d5e971..191efe2945 100644 --- a/git-remote.html +++ b/git-remote.html @@ -531,7 +531,7 @@ $ git merge origin diff --git a/git-repack.html b/git-repack.html index f80320a4f0..09df6bfc03 100644 --- a/git-repack.html +++ b/git-repack.html @@ -496,7 +496,7 @@ that way can try to use older git with it).

diff --git a/git-repo-config.html b/git-repo-config.html index 6f464566c0..1c58884ca8 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -329,7 +329,7 @@ documentation of that command.

diff --git a/git-request-pull.html b/git-request-pull.html index bf334822a5..befcb9f612 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -370,7 +370,7 @@ the given URL in the generated summary.

diff --git a/git-rerere.html b/git-rerere.html index e6cd3dbbff..782d48778a 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -528,7 +528,7 @@ conflict.

diff --git a/git-reset.html b/git-reset.html index d342a201e5..83ac1e4257 100644 --- a/git-reset.html +++ b/git-reset.html @@ -701,7 +701,7 @@ Adds the file to the index again. diff --git a/git-rev-list.html b/git-rev-list.html index 95bb6a1ffe..6b9c52a122 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1662,7 +1662,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-parse.html b/git-rev-parse.html index 74b49be273..3e88d14997 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -1024,7 +1024,7 @@ Junio C Hamano <gitster@pobox.com> and Pierre Habouzit <madcoder@debian diff --git a/git-revert.html b/git-revert.html index 811d9a48fa..c420dc5c16 100644 --- a/git-revert.html +++ b/git-revert.html @@ -439,7 +439,7 @@ effect to your index in a row.

diff --git a/git-rm.html b/git-rm.html index 12c5e9d16f..13b4fc21d2 100644 --- a/git-rm.html +++ b/git-rm.html @@ -484,7 +484,7 @@ git rm -f git-*.sh diff --git a/git-send-email.html b/git-send-email.html index 0c208ef509..42ba1c07bf 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -812,7 +812,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-pack.html b/git-send-pack.html index caf6026f98..b56837193a 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -501,7 +501,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-sh-setup.html b/git-sh-setup.html index 44955ab835..01b7c4e6e4 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html @@ -431,7 +431,7 @@ get_author_ident_from_commit diff --git a/git-shell.html b/git-shell.html index f6bc57b336..f53b5071b7 100644 --- a/git-shell.html +++ b/git-shell.html @@ -347,7 +347,7 @@ interactive.

diff --git a/git-shortlog.html b/git-shortlog.html index ed974c08ec..eacbc78742 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -483,7 +483,7 @@ the email address.

diff --git a/git-show-branch.html b/git-show-branch.html index 405f0a6c37..6607af4475 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -608,7 +608,7 @@ topologically related with each other.

diff --git a/git-show-index.html b/git-show-index.html index 6305d37ff0..dd10ec5320 100644 --- a/git-show-index.html +++ b/git-show-index.html @@ -344,7 +344,7 @@ offset and SHA1 of each object.

diff --git a/git-show-ref.html b/git-show-ref.html index 66e8fee60a..7ef3b99167 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -529,7 +529,7 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.

diff --git a/git-show.html b/git-show.html index 67627bdc0b..a855dbf283 100644 --- a/git-show.html +++ b/git-show.html @@ -895,7 +895,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

diff --git a/git-stage.html b/git-stage.html index 46a9306e10..eb324f2d2d 100644 --- a/git-stage.html +++ b/git-stage.html @@ -330,7 +330,7 @@ documentation of that command.

diff --git a/git-stash.html b/git-stash.html index e6a72858a2..adc353bcd7 100644 --- a/git-stash.html +++ b/git-stash.html @@ -586,7 +586,7 @@ $ git commit foo -m 'Remaining parts' diff --git a/git-status.html b/git-status.html index f256c0c09d..38592c89a5 100644 --- a/git-status.html +++ b/git-status.html @@ -380,7 +380,7 @@ Junio C Hamano <gitster@pobox.com>.

diff --git a/git-stripspace.html b/git-stripspace.html index 9e40dcdd95..842ad34446 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -364,7 +364,7 @@ git-stripspace(1) Manual Page diff --git a/git-submodule.html b/git-submodule.html index 0b2aabe0c8..cb1a014d04 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -473,8 +473,9 @@ foreach the processing to terminate. This can be overridden by adding || : to the end of the command.

-

As an example, "git submodule foreach echo $path git rev-parse HEAD will -show the path and currently checked out commit for each submodule.

+

As an example, +git submodule foreach 'echo $path `git +rev-parse HEAD`'+ will show the path and currently checked out +commit for each submodule.

sync @@ -624,7 +625,7 @@ for details.

diff --git a/git-submodule.txt b/git-submodule.txt index 470bd75ad9..683ba1a1eb 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -141,8 +141,9 @@ foreach:: the processing to terminate. This can be overridden by adding '|| :' to the end of the command. + -As an example, "git submodule foreach 'echo $path `git rev-parse HEAD`' will -show the path and currently checked out commit for each submodule. +As an example, +git submodule foreach \'echo $path {backtick}git +rev-parse HEAD{backtick}'+ will show the path and currently checked out +commit for each submodule. sync:: Synchronizes submodules' remote URL configuration setting diff --git a/git-svn.html b/git-svn.html index 4d0150442c..740e227e1b 100644 --- a/git-svn.html +++ b/git-svn.html @@ -1489,7 +1489,7 @@ should be manually entered with a text-editor or using git-config.

< diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 375444208a..758c992214 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -387,7 +387,7 @@ name is not a symbolic ref, or 128 if another error occurs.

diff --git a/git-tag.html b/git-tag.html index 6d64d00d76..c686bd51a0 100644 --- a/git-tag.html +++ b/git-tag.html @@ -610,7 +610,7 @@ Junio C Hamano <gitster@pobox.com> and Chris Wright <chrisw@osdl.org> diff --git a/git-tar-tree.html b/git-tar-tree.html index 8f78b80421..9a7532be82 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html @@ -447,7 +447,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 472fdb71c0..1ae8a304ae 100644 --- a/git-tools.html +++ b/git-tools.html @@ -486,7 +486,7 @@ comprehensive list.

diff --git a/git-unpack-file.html b/git-unpack-file.html index 7df3c6d35a..c790ae8640 100644 --- a/git-unpack-file.html +++ b/git-unpack-file.html @@ -355,7 +355,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 eabc9137fd..3cfb088c38 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html @@ -389,7 +389,7 @@ new packs and replace existing ones.

diff --git a/git-update-index.html b/git-update-index.html index af81ee242e..3d552dce3a 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -798,7 +798,7 @@ ctime for marking files processed) (see git-config(1)< diff --git a/git-update-ref.html b/git-update-ref.html index 48320fcaf0..5e31465bf0 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -408,7 +408,7 @@ or does not have committer information available.

diff --git a/git-update-server-info.html b/git-update-server-info.html index d14ca0b9d9..4d852e99da 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -378,7 +378,7 @@ info/refs diff --git a/git-upload-archive.html b/git-upload-archive.html index 208419c7a9..e75d62e210 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html @@ -357,7 +357,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 84cf22bd6c..95dde1a082 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -374,7 +374,7 @@ repository. For push operations, see git-send-pack.

diff --git a/git-var.html b/git-var.html index 9d3357406d..95656d8af9 100644 --- a/git-var.html +++ b/git-var.html @@ -420,7 +420,7 @@ Your sysadmin must hate you! diff --git a/git-verify-pack.html b/git-verify-pack.html index 97403fe846..d6d47b12a2 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -386,7 +386,7 @@ corresponding pack file.

diff --git a/git-verify-tag.html b/git-verify-tag.html index 8849d38f15..c15467e6e8 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -353,7 +353,7 @@ git-verify-tag(1) Manual Page diff --git a/git-web--browse.html b/git-web--browse.html index 90017611c6..803bb89582 100644 --- a/git-web--browse.html +++ b/git-web--browse.html @@ -481,7 +481,7 @@ git-list <git@vger.kernel.org>.

diff --git a/git-whatchanged.html b/git-whatchanged.html index 5648664b86..8a339f1780 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -834,7 +834,7 @@ Junio C Hamano <gitster@pobox.com>

diff --git a/git-write-tree.html b/git-write-tree.html index 8048310587..ec80d2d0ed 100644 --- a/git-write-tree.html +++ b/git-write-tree.html @@ -371,7 +371,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 9949aa9fda..c9f95d345d 100644 --- a/git.html +++ b/git.html @@ -2044,7 +2044,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/gitattributes.html b/gitattributes.html index 8b7280c00b..6d581be267 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -1023,7 +1023,7 @@ frotz unspecified diff --git a/gitcli.html b/gitcli.html index baf9cc91cf..ef4df2b8aa 100644 --- a/gitcli.html +++ b/gitcli.html @@ -514,7 +514,7 @@ information.

diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 890ecf5209..4ef0a8613b 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html @@ -2040,7 +2040,7 @@ to follow, not easier.

diff --git a/gitcvs-migration.html b/gitcvs-migration.html index 9892bf6525..1045aa0034 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html @@ -494,7 +494,7 @@ repositories without the need for a central maintainer.

diff --git a/gitdiffcore.html b/gitdiffcore.html index 18effd17a2..888759cfc2 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html @@ -602,7 +602,7 @@ t diff --git a/gitglossary.html b/gitglossary.html index 23d8c4334a..4d7c4789e1 100644 --- a/gitglossary.html +++ b/gitglossary.html @@ -1166,7 +1166,7 @@ This commit is referred to as a "merge commit", or sometimes just a diff --git a/githooks.html b/githooks.html index 3959288340..428fe42093 100644 --- a/githooks.html +++ b/githooks.html @@ -592,7 +592,7 @@ to abort.

diff --git a/gitignore.html b/gitignore.html index 1c0aeceac3..7789a49541 100644 --- a/gitignore.html +++ b/gitignore.html @@ -486,7 +486,7 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.

diff --git a/gitk.html b/gitk.html index 1e0b4723bc..e59794e0bc 100644 --- a/gitk.html +++ b/gitk.html @@ -514,7 +514,7 @@ such as display options, font, and colors.

diff --git a/gitmodules.html b/gitmodules.html index 57a2604ce7..ba9ab0475e 100644 --- a/gitmodules.html +++ b/gitmodules.html @@ -401,7 +401,7 @@ submodules an url is specified which can be used for cloning the submodules.

diff --git a/gitrepository-layout.html b/gitrepository-layout.html index 723c708351..5654b45f60 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html @@ -661,7 +661,7 @@ shallow diff --git a/gittutorial-2.html b/gittutorial-2.html index 1662773f0a..bb974b498b 100644 --- a/gittutorial-2.html +++ b/gittutorial-2.html @@ -724,7 +724,7 @@ example, creating a new commit.

diff --git a/gittutorial.html b/gittutorial.html index fbe5efd968..80d0222c6b 100644 --- a/gittutorial.html +++ b/gittutorial.html @@ -594,11 +594,11 @@ pulling, like this:

alice$ git log -p HEAD..FETCH_HEAD

This operation is safe even if Alice has uncommitted local changes. -The range notation HEAD..FETCH_HEAD" means "show everything that is reachable -from the FETCH_HEAD but exclude anything that is reachable from HEAD. +The range notation "HEAD..FETCH_HEAD" means "show everything that is reachable +from the FETCH_HEAD but exclude anything that is reachable from HEAD". Alice already knows everything that leads to her current state (HEAD), -and reviewing what Bob has in his state (FETCH_HEAD) that she has not -seen with this command

+and reviews what Bob has in his state (FETCH_HEAD) that she has not +seen with this command.

If Alice wants to visualize what Bob did since their histories forked she can issue the following command:

@@ -629,9 +629,9 @@ it easier:

alice$ git remote add bob /home/bob/myrepo
-

With this, Alice can perform the first part of the "pull" operation alone using the -git-fetch command without merging them with her own branch, -using:

+

With this, Alice can perform the first part of the "pull" operation +alone using the git-fetch command without merging them with her own +branch, using:

alice$ git fetch bob
@@ -793,20 +793,20 @@ $ git log v2.5.. Makefile # commits since v2.5 which modify

You can also give git-log a "range" of commits where the first is not necessarily an ancestor of the second; for example, if the tips of -the branches "stable-release" and "master" diverged from a common +the branches "stable" and "master" diverged from a common commit some time ago, then

-
$ git log stable..experimental
+
$ git log stable..master
-

will list commits made in the experimental branch but not in the +

will list commits made in the master branch but not in the stable branch, while

-
$ git log experimental..stable
+
$ git log master..stable

will show the list of commits made on the stable branch but not -the experimental branch.

+the master branch.

The git-log command has a weakness: it must present commits in a list. When the history has lines of development that diverged and then merged back together, the order in which git-log presents @@ -916,7 +916,7 @@ digressions that may be interesting at this point are:

diff --git a/gittutorial.txt b/gittutorial.txt index c7fa949c28..cf0689cfeb 100644 --- a/gittutorial.txt +++ b/gittutorial.txt @@ -332,11 +332,11 @@ alice$ git log -p HEAD..FETCH_HEAD ------------------------------------------------ This operation is safe even if Alice has uncommitted local changes. -The range notation HEAD..FETCH_HEAD" means "show everything that is reachable -from the FETCH_HEAD but exclude anything that is reachable from HEAD. +The range notation "HEAD..FETCH_HEAD" means "show everything that is reachable +from the FETCH_HEAD but exclude anything that is reachable from HEAD". Alice already knows everything that leads to her current state (HEAD), -and reviewing what Bob has in his state (FETCH_HEAD) that she has not -seen with this command +and reviews what Bob has in his state (FETCH_HEAD) that she has not +seen with this command. If Alice wants to visualize what Bob did since their histories forked she can issue the following command: @@ -375,9 +375,9 @@ it easier: alice$ git remote add bob /home/bob/myrepo ------------------------------------------------ -With this, Alice can perform the first part of the "pull" operation alone using the -'git-fetch' command without merging them with her own branch, -using: +With this, Alice can perform the first part of the "pull" operation +alone using the 'git-fetch' command without merging them with her own +branch, using: ------------------------------------- alice$ git fetch bob @@ -566,22 +566,22 @@ $ git log v2.5.. Makefile # commits since v2.5 which modify You can also give 'git-log' a "range" of commits where the first is not necessarily an ancestor of the second; for example, if the tips of -the branches "stable-release" and "master" diverged from a common +the branches "stable" and "master" diverged from a common commit some time ago, then ------------------------------------- -$ git log stable..experimental +$ git log stable..master ------------------------------------- -will list commits made in the experimental branch but not in the +will list commits made in the master branch but not in the stable branch, while ------------------------------------- -$ git log experimental..stable +$ git log master..stable ------------------------------------- will show the list of commits made on the stable branch but not -the experimental branch. +the master branch. The 'git-log' command has a weakness: it must present commits in a list. When the history has lines of development that diverged and diff --git a/gitworkflows.html b/gitworkflows.html index 996287c952..68469f031d 100644 --- a/gitworkflows.html +++ b/gitworkflows.html @@ -650,7 +650,7 @@ other options.

diff --git a/howto-index.html b/howto-index.html index 6c3ba79af2..2a5ab3a62a 100644 --- a/howto-index.html +++ b/howto-index.html @@ -417,7 +417,7 @@ strategy.

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 80f267ea20..0a52860f49 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -482,7 +482,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 309a9a7781..2bceb77551 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -413,7 +413,7 @@ Please note that if the other project merges from you, then it will diff --git a/technical/api-allocation-growing.html b/technical/api-allocation-growing.html index c19ba70937..87396bb909 100644 --- a/technical/api-allocation-growing.html +++ b/technical/api-allocation-growing.html @@ -354,7 +354,7 @@ ary[nr++] = value you like; diff --git a/technical/api-builtin.html b/technical/api-builtin.html index 09c327147f..ef6942c152 100644 --- a/technical/api-builtin.html +++ b/technical/api-builtin.html @@ -413,7 +413,7 @@ command.

diff --git a/technical/api-decorate.html b/technical/api-decorate.html index ff375b371d..ee78d922ff 100644 --- a/technical/api-decorate.html +++ b/technical/api-decorate.html @@ -317,7 +317,7 @@ div#toc a:visited { color: blue; } diff --git a/technical/api-diff.html b/technical/api-diff.html index be4e6c052a..3805784143 100644 --- a/technical/api-diff.html +++ b/technical/api-diff.html @@ -630,7 +630,7 @@ RECURSIVE, TREE_IN_RECURSIVE diff --git a/technical/api-directory-listing.html b/technical/api-directory-listing.html index b69bda4a12..b3aa2eaf3a 100644 --- a/technical/api-directory-listing.html +++ b/technical/api-directory-listing.html @@ -441,7 +441,7 @@ Use dir.entries[]. diff --git a/technical/api-gitattributes.html b/technical/api-gitattributes.html index cef8892ae6..94cee374da 100644 --- a/technical/api-gitattributes.html +++ b/technical/api-gitattributes.html @@ -465,7 +465,7 @@ Act on .value member of the result, left in check[]: diff --git a/technical/api-grep.html b/technical/api-grep.html index acddbe4967..9b50bed1b3 100644 --- a/technical/api-grep.html +++ b/technical/api-grep.html @@ -324,7 +324,7 @@ grep_buffer() diff --git a/technical/api-hash.html b/technical/api-hash.html index cb4e134851..7148132832 100644 --- a/technical/api-hash.html +++ b/technical/api-hash.html @@ -317,7 +317,7 @@ div#toc a:visited { color: blue; } diff --git a/technical/api-history-graph.html b/technical/api-history-graph.html index ffc10396fb..11971685e4 100644 --- a/technical/api-history-graph.html +++ b/technical/api-history-graph.html @@ -549,7 +549,7 @@ outputting that information, if desired.

diff --git a/technical/api-in-core-index.html b/technical/api-in-core-index.html index adad4a04ae..998f4cfd96 100644 --- a/technical/api-in-core-index.html +++ b/technical/api-in-core-index.html @@ -385,7 +385,7 @@ cache_tree_update() diff --git a/technical/api-index.html b/technical/api-index.html index 54df94426e..26c23334aa 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -430,7 +430,7 @@ documents them.

diff --git a/technical/api-lockfile.html b/technical/api-lockfile.html index 90fdae38e6..89c3cf4352 100644 --- a/technical/api-lockfile.html +++ b/technical/api-lockfile.html @@ -409,7 +409,7 @@ that unrelated file descriptor.

diff --git a/technical/api-object-access.html b/technical/api-object-access.html index 8757069249..43b934de53 100644 --- a/technical/api-object-access.html +++ b/technical/api-object-access.html @@ -359,7 +359,7 @@ Use of object flags diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index baced8c1ae..06751978b7 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -740,7 +740,7 @@ for real-world examples.

diff --git a/technical/api-quote.html b/technical/api-quote.html index 35edc7ed84..67261a8b5b 100644 --- a/technical/api-quote.html +++ b/technical/api-quote.html @@ -334,7 +334,7 @@ quoting for foreign languages diff --git a/technical/api-remote.html b/technical/api-remote.html index c67ce06af1..780c442e04 100644 --- a/technical/api-remote.html +++ b/technical/api-remote.html @@ -492,7 +492,7 @@ process of interacting with remotes.

diff --git a/technical/api-revision-walking.html b/technical/api-revision-walking.html index 0b0ab6b72c..f1cbc6e27d 100644 --- a/technical/api-revision-walking.html +++ b/technical/api-revision-walking.html @@ -413,7 +413,7 @@ remaining functions; diff --git a/technical/api-run-command.html b/technical/api-run-command.html index ac584308eb..140bc6d341 100644 --- a/technical/api-run-command.html +++ b/technical/api-run-command.html @@ -631,7 +631,7 @@ It must not change the program's state that the caller of the diff --git a/technical/api-setup.html b/technical/api-setup.html index 0f59d667fc..7a6efd553f 100644 --- a/technical/api-setup.html +++ b/technical/api-setup.html @@ -349,7 +349,7 @@ get_pathspec() diff --git a/technical/api-strbuf.html b/technical/api-strbuf.html index 862903297c..cae82812a9 100644 --- a/technical/api-strbuf.html +++ b/technical/api-strbuf.html @@ -749,7 +749,7 @@ same behaviour as well. diff --git a/technical/api-string-list.html b/technical/api-string-list.html index 605cf83c1f..f8403c3d61 100644 --- a/technical/api-string-list.html +++ b/technical/api-string-list.html @@ -534,7 +534,7 @@ Setting the strdup_strings member to 1 will strdup() the strings diff --git a/technical/api-tree-walking.html b/technical/api-tree-walking.html index cd8000beb9..8ed26802c1 100644 --- a/technical/api-tree-walking.html +++ b/technical/api-tree-walking.html @@ -344,7 +344,7 @@ get_tree_entry diff --git a/technical/api-xdiff-interface.html b/technical/api-xdiff-interface.html index a5a3b35298..447976d483 100644 --- a/technical/api-xdiff-interface.html +++ b/technical/api-xdiff-interface.html @@ -318,7 +318,7 @@ xdiff_emit_consume_fn.

diff --git a/user-manual.html b/user-manual.html index aa002702e8..2c11f1b353 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,4 +1,4 @@ -Git User's Manual (for version 1.5.3 or newer)

Git User's Manual (for version 1.5.3 or newer)

Table of Contents

Preface
1. Repositories and Branches
How to get a git repository
How to check out a different version of a project
Understanding History: Commits
Understanding history: commits, parents, and reachability
Understanding history: History diagrams
Understanding history: What is a branch?
Manipulating branches
Examining an old version without creating a new branch
Examining branches from a remote repository
Naming branches, tags, and other references
Updating a repository with git fetch
Fetching branches from other repositories
2. Exploring git history
How to use bisect to find a regression
Naming commits
Creating tags
Browsing revisions
Generating diffs
Viewing old file versions
Examples
Counting the number of commits on a branch
Check whether two branches point at the same history
Find first tagged version including a given fix
Showing commits unique to a given branch
Creating a changelog and tarball for a software release
Finding commits referencing a file with given content
3. Developing with git
Telling git your name
Creating a new repository
How to make a commit
Creating good commit messages
Ignoring files
How to merge
Resolving a merge
Getting conflict-resolution help during a merge
Undoing a merge
Fast-forward merges
Fixing mistakes
Fixing a mistake with a new commit
Fixing a mistake by rewriting history
Checking out an old version of a file
Temporarily setting aside work in progress
Ensuring good performance
Ensuring reliability
Checking the repository for corruption
Recovering lost changes
4. Sharing development with others
Getting updates with git pull
Submitting patches to a project
Importing patches to a project
Public git repositories
Setting up a public repository
Exporting a git repository via the git protocol
Exporting a git repository via http
Pushing changes to a public repository
What to do when a push fails
Setting up a shared repository
Allowing web browsing of a repository
Examples
Maintaining topic branches for a Linux subsystem maintainer
5. Rewriting history and maintaining patch series
Creating the perfect patch series
Keeping a patch series up to date using git rebase
Rewriting a single commit
Reordering or selecting from a patch series
Other tools
Problems with rewriting history
Why bisecting merge commits can be harder than bisecting linear history
6. Advanced branch management
Fetching individual branches
git fetch and fast-forwards
Forcing git fetch to do non-fast-forward updates
Configuring remote branches
7. Git concepts
The Object Database
Commit Object
Tree Object
Blob Object
Trust
Tag Object
How git stores objects efficiently: pack files
Dangling objects
Recovering from repository corruption
The index
8. Submodules
Pitfalls with submodules
9. Low-level git operations
Object access and manipulation
The Workflow
working directory -> index
index -> object database
object database -> index
index -> working directory
Tying it all together
Examining the data
Merging multiple trees
Merging multiple trees, continued
10. Hacking git
Object storage format
A birds-eye view of Git's source code
11. GIT Glossary
A. Git Quick Reference
Creating a new repository
Managing branches
Exploring history
Making changes
Merging
Sharing your changes
Repository maintenance
B. Notes and todo list for this manual

Preface

Git is a fast distributed revision control system.

This manual is designed to be readable by someone with basic UNIX +Git User's Manual (for version 1.5.3 or newer)

Git User's Manual (for version 1.5.3 or newer)

Table of Contents

Preface
1. Repositories and Branches
How to get a git repository
How to check out a different version of a project
Understanding History: Commits
Understanding history: commits, parents, and reachability
Understanding history: History diagrams
Understanding history: What is a branch?
Manipulating branches
Examining an old version without creating a new branch
Examining branches from a remote repository
Naming branches, tags, and other references
Updating a repository with git fetch
Fetching branches from other repositories
2. Exploring git history
How to use bisect to find a regression
Naming commits
Creating tags
Browsing revisions
Generating diffs
Viewing old file versions
Examples
Counting the number of commits on a branch
Check whether two branches point at the same history
Find first tagged version including a given fix
Showing commits unique to a given branch
Creating a changelog and tarball for a software release
Finding commits referencing a file with given content
3. Developing with git
Telling git your name
Creating a new repository
How to make a commit
Creating good commit messages
Ignoring files
How to merge
Resolving a merge
Getting conflict-resolution help during a merge
Undoing a merge
Fast-forward merges
Fixing mistakes
Fixing a mistake with a new commit
Fixing a mistake by rewriting history
Checking out an old version of a file
Temporarily setting aside work in progress
Ensuring good performance
Ensuring reliability
Checking the repository for corruption
Recovering lost changes
4. Sharing development with others
Getting updates with git pull
Submitting patches to a project
Importing patches to a project
Public git repositories
Setting up a public repository
Exporting a git repository via the git protocol
Exporting a git repository via http
Pushing changes to a public repository
What to do when a push fails
Setting up a shared repository
Allowing web browsing of a repository
Examples
Maintaining topic branches for a Linux subsystem maintainer
5. Rewriting history and maintaining patch series
Creating the perfect patch series
Keeping a patch series up to date using git rebase
Rewriting a single commit
Reordering or selecting from a patch series
Other tools
Problems with rewriting history
Why bisecting merge commits can be harder than bisecting linear history
6. Advanced branch management
Fetching individual branches
git fetch and fast-forwards
Forcing git fetch to do non-fast-forward updates
Configuring remote branches
7. Git concepts
The Object Database
Commit Object
Tree Object
Blob Object
Trust
Tag Object
How git stores objects efficiently: pack files
Dangling objects
Recovering from repository corruption
The index
8. Submodules
Pitfalls with submodules
9. Low-level git operations
Object access and manipulation
The Workflow
working directory -> index
index -> object database
object database -> index
index -> working directory
Tying it all together
Examining the data
Merging multiple trees
Merging multiple trees, continued
10. Hacking git
Object storage format
A birds-eye view of Git's source code
11. GIT Glossary
A. Git Quick Reference
Creating a new repository
Managing branches
Exploring history
Making changes
Merging
Sharing your changes
Repository maintenance
B. Notes and todo list for this manual

Preface

Git is a fast distributed revision control system.

This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of git.

Chapter 1, Repositories and Branches and Chapter 2, Exploring git history explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for -- 2.11.4.GIT