From 250471115e57233c974e232132a6fc58f8e8be6d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 18 Dec 2023 14:51:21 -0800 Subject: Autogenerated HTML docs for v2.43.0-121-g624eb9 --- MyFirstContribution.html | 6 +- MyFirstContribution.txt | 2 +- MyFirstObjectWalk.html | 2 +- RelNotes/1.6.2.txt | 2 +- RelNotes/1.6.3.txt | 2 +- RelNotes/1.6.4.txt | 2 +- RelNotes/1.6.5.txt | 2 +- RelNotes/1.6.6.txt | 2 +- RelNotes/2.44.0.txt | 29 + ReviewingGuidelines.html | 2 +- SubmittingPatches.html | 2 +- ToolsForGit.html | 2 +- cmds-plumbingmanipulators.txt | 3 + everyday.html | 2 +- git-commit.html | 2 +- git-cvsimport.html | 6 +- git-cvsimport.txt | 4 +- git-format-patch.html | 6 +- git-format-patch.txt | 4 +- git-imap-send.html | 4 +- git-imap-send.txt | 2 +- git-merge-file.html | 14 +- git-merge-file.txt | 6 + git-merge.html | 2 +- git-pull.html | 2 +- git-remote-helpers.html | 2 +- git-replay.html | 2384 ++++++++++++++++++++++++++ git-replay.txt | 127 ++ git-send-email.html | 4 +- git-send-email.txt | 2 +- git.html | 18 +- git.txt | 8 +- gitcore-tutorial.html | 4 +- gitcore-tutorial.txt | 2 +- gitprotocol-http.html | 6 +- gitprotocol-http.txt | 4 +- gitweb.conf.html | 6 +- gitweb.conf.txt | 4 +- gitweb.html | 4 +- gitweb.txt | 2 +- howto-index.html | 4 +- howto/coordinate-embargoed-releases.html | 2 +- howto/keep-canonical-history-correct.html | 6 +- howto/keep-canonical-history-correct.txt | 2 +- howto/maintain-git.html | 4 +- howto/new-command.html | 4 +- howto/rebase-from-internal-branch.html | 4 +- howto/rebuild-from-update-hook.html | 4 +- howto/recover-corrupted-blob-object.html | 4 +- howto/recover-corrupted-object-harder.html | 4 +- howto/revert-a-faulty-merge.html | 4 +- howto/revert-branch-rebase.html | 4 +- howto/separating-topic-branches.html | 4 +- howto/setup-git-server-over-http.html | 4 +- howto/update-hook-example.html | 4 +- howto/use-git-daemon.html | 4 +- howto/using-merge-subtree.html | 4 +- howto/using-signed-tag-in-pull-request.html | 4 +- signoff-option.txt | 2 +- technical/api-error-handling.html | 2 +- technical/api-index.html | 2 +- technical/api-merge.html | 2 +- technical/api-parse-options.html | 2 +- technical/api-simple-ipc.html | 2 +- technical/api-trace2.html | 2 +- technical/bitmap-format.html | 2 +- technical/bundle-uri.html | 2 +- technical/hash-function-transition.html | 2 +- technical/long-running-process-protocol.html | 2 +- technical/multi-pack-index.html | 2 +- technical/pack-heuristics.html | 2 +- technical/parallel-checkout.html | 2 +- technical/partial-clone.html | 2 +- technical/racy-git.html | 2 +- technical/scalar.html | 2 +- technical/send-pack-pipeline.html | 2 +- technical/shallow.html | 2 +- technical/trivial-merge.html | 2 +- technical/unit-tests.html | 2 +- user-manual.html | 2 +- 80 files changed, 2686 insertions(+), 117 deletions(-) create mode 100644 git-replay.html create mode 100644 git-replay.txt diff --git a/MyFirstContribution.html b/MyFirstContribution.html index d8e32043a..27f433575 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1557,7 +1557,7 @@ Johannes Schindelin to make life as a Git contributor easier for those used to the GitHub PR workflow. It allows contributors to open pull requests against its mirror of the Git project, and does some magic to turn the PR into a set of emails and send them out for you. It also runs the Git continuous integration -suite for you. It’s documented at http://gitgitgadget.github.io.

+suite for you. It’s documented at https://gitgitgadget.github.io/.

Forking git/git on GitHub

Before you can send your patch off to be reviewed using GitGitGadget, you will @@ -2097,7 +2097,7 @@ should generate your diffs from <topic>..<mybranch> and

diff --git a/MyFirstContribution.txt b/MyFirstContribution.txt index 7cfed60c2..279f6a3e7 100644 --- a/MyFirstContribution.txt +++ b/MyFirstContribution.txt @@ -833,7 +833,7 @@ Johannes Schindelin to make life as a Git contributor easier for those used to the GitHub PR workflow. It allows contributors to open pull requests against its mirror of the Git project, and does some magic to turn the PR into a set of emails and send them out for you. It also runs the Git continuous integration -suite for you. It's documented at http://gitgitgadget.github.io. +suite for you. It's documented at https://gitgitgadget.github.io/. [[create-fork]] === Forking `git/git` on GitHub diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index 1542cd608..265a4c47e 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/RelNotes/1.6.2.txt b/RelNotes/1.6.2.txt index 980adfb31..166d73c60 100644 --- a/RelNotes/1.6.2.txt +++ b/RelNotes/1.6.2.txt @@ -10,7 +10,7 @@ To ease the transition plan, the receiving repository of such a push running this release will issue a big warning when the configuration variable is missing. Please refer to: - http://git.or.cz/gitwiki/GitFaq#non-bare + https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ for more details on the reason why this change is needed and the diff --git a/RelNotes/1.6.3.txt b/RelNotes/1.6.3.txt index 4bcff945e..bbf177fc3 100644 --- a/RelNotes/1.6.3.txt +++ b/RelNotes/1.6.3.txt @@ -10,7 +10,7 @@ To ease the transition plan, the receiving repository of such a push running this release will issue a big warning when the configuration variable is missing. Please refer to: - http://git.or.cz/gitwiki/GitFaq#non-bare + https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ for more details on the reason why this change is needed and the diff --git a/RelNotes/1.6.4.txt b/RelNotes/1.6.4.txt index a2a34b43a..0fccfb0bf 100644 --- a/RelNotes/1.6.4.txt +++ b/RelNotes/1.6.4.txt @@ -10,7 +10,7 @@ To ease the transition plan, the receiving repository of such a push running this release will issue a big warning when the configuration variable is missing. Please refer to: - http://git.or.cz/gitwiki/GitFaq#non-bare + https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ for more details on the reason why this change is needed and the diff --git a/RelNotes/1.6.5.txt b/RelNotes/1.6.5.txt index 6c7f7da7e..79cb1b2b6 100644 --- a/RelNotes/1.6.5.txt +++ b/RelNotes/1.6.5.txt @@ -21,7 +21,7 @@ To ease the transition plan, the receiving repository of such a push running this release will issue a big warning when the configuration variable is missing. Please refer to: - http://git.or.cz/gitwiki/GitFaq#non-bare + https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ for more details on the reason why this change is needed and the diff --git a/RelNotes/1.6.6.txt b/RelNotes/1.6.6.txt index 3ed1e0143..88b86a827 100644 --- a/RelNotes/1.6.6.txt +++ b/RelNotes/1.6.6.txt @@ -63,7 +63,7 @@ users will fare this time. Please refer to: - http://git.or.cz/gitwiki/GitFaq#non-bare + https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ for more details on the reason why this change is needed and the diff --git a/RelNotes/2.44.0.txt b/RelNotes/2.44.0.txt index 6a2bd93c9..94609c03c 100644 --- a/RelNotes/2.44.0.txt +++ b/RelNotes/2.44.0.txt @@ -9,6 +9,12 @@ UI, Workflows & Features * "git rebase --autosquash" is now enabled for non-interactive rebase, but it is still incompatible with the apply backend. + * Introduce "git replay", a tool meant on the server side without + working tree to recreate a history. + + * "git merge-file" learned to take the "--diff-algorithm" option to + use algorithm different from the default "myers" diff. + Performance, Internal Implementation, Development Support etc. @@ -21,6 +27,11 @@ Performance, Internal Implementation, Development Support etc. in an unspecified order, to allow certain optimizations to take advantage of. + * Simplify API implementation to delete references by eliminating + duplication. + + * Subject approxidate() and show_date() machinery to OSS-Fuzz. + Fixes since v2.43 ----------------- @@ -40,4 +51,22 @@ Fixes since v2.43 simplifying our implementation. (merge 6ff658cc78 tz/send-email-negatable-options later to maint). + * Earlier we stopped relying on commit-graph that (still) records + information about commits that are lost from the object store, + which has negative performance implications. The default has been + flipped to disable this pessimization. + (merge b1df3b3867 ps/commit-graph-less-paranoid later to maint). + + * Stale URLs have been updated to their current counterparts (or + archive.org) and HTTP links are replaced with working HTTPS links. + (merge 62b4f7b9c6 js/update-urls-in-doc-and-comment later to maint). + + * trace2 streams used to record the URLs that potentially embed + authentication material, which has been corrected. + (merge 16fa3eebc0 jh/trace2-redact-auth later to maint). + * Other code cleanup, docfix, build fix, etc. + (merge 50f1abcff6 js/packfile-h-typofix later to maint). + (merge cbf498eb53 jb/reflog-expire-delete-dry-run-options later to maint). + (merge 7854bf4960 rs/i18n-cannot-be-used-together later to maint). + (merge cd3c28c53a rs/column-leakfix later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index a8a6d0e72..3c6748a36 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index e3ee3c4ea..032989b00 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/ToolsForGit.html b/ToolsForGit.html index 192f53e6f..dbd4dfcb8 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/cmds-plumbingmanipulators.txt b/cmds-plumbingmanipulators.txt index 8a1ac3631..6ea8c605c 100644 --- a/cmds-plumbingmanipulators.txt +++ b/cmds-plumbingmanipulators.txt @@ -40,6 +40,9 @@ linkgit:git-prune-packed[1]:: linkgit:git-read-tree[1]:: Reads tree information into the index. +linkgit:git-replay[1]:: + EXPERIMENTAL: Replay commits on a new base, works with bare repos too. + linkgit:git-symbolic-ref[1]:: Read, modify and delete symbolic refs. diff --git a/everyday.html b/everyday.html index 9d430f95b..aa9aaad43 100644 --- a/everyday.html +++ b/everyday.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/git-commit.html b/git-commit.html index 539622ffc..992b1353a 100644 --- a/git-commit.html +++ b/git-commit.html @@ -1071,7 +1071,7 @@ See git-rebase(1) for details.

the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. - (See http://developercertificate.org for the one used by the + (See https://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project. diff --git a/git-cvsimport.html b/git-cvsimport.html index af3a9caee..d91b60e2c 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -765,7 +765,7 @@ git-cvsimport(1) Manual Page deprecated; it does not work with cvsps version 3 and later. If you are performing a one-shot import of a CVS repository consider using cvs2git or -cvs-fast-export.

+cvs-fast-export.

Imports a CVS repository into Git. It will either create a new repository, or incrementally import into an existing one.

Splitting the CVS log into patch sets is done by cvsps. @@ -1090,7 +1090,7 @@ want to import, consider using cvs2git:

  • -cvs2git (part of cvs2svn), http://subversion.apache.org/ +cvs2git (part of cvs2svn), https://subversion.apache.org/

@@ -1107,7 +1107,7 @@ cvs2git (part of cvs2svn), http://subversion.apache.org/ diff --git a/git-cvsimport.txt b/git-cvsimport.txt index b3f27671a..90fdc2551 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt @@ -22,7 +22,7 @@ DESCRIPTION deprecated; it does not work with cvsps version 3 and later. If you are performing a one-shot import of a CVS repository consider using http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or -http://www.catb.org/esr/cvs-fast-export/[cvs-fast-export]. +https://gitlab.com/esr/cvs-fast-export[cvs-fast-export]. Imports a CVS repository into Git. It will either create a new repository, or incrementally import into an existing one. @@ -221,7 +221,7 @@ Problems related to tags: If you suspect that any of these issues may apply to the repository you want to import, consider using cvs2git: -* cvs2git (part of cvs2svn), `http://subversion.apache.org/` +* cvs2git (part of cvs2svn), `https://subversion.apache.org/` GIT --- diff --git a/git-format-patch.html b/git-format-patch.html index d2e154ad0..f092febbc 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -2391,8 +2391,8 @@ and the patches will not be mangled.

Approach #3 (external editor)

The following Thunderbird extensions are needed: -AboutConfig from http://aboutconfig.mozdev.org/ and -External Editor from http://globs.org/articles.php?lng=en&pg=8

+AboutConfig from https://mjg.github.io/AboutConfig/ and +External Editor from https://globs.org/articles.php?lng=en&pg=8

  1. @@ -2618,7 +2618,7 @@ merge commit.

diff --git a/git-format-patch.txt b/git-format-patch.txt index aaafce24b..414da6b73 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -610,8 +610,8 @@ Approach #3 (external editor) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The following Thunderbird extensions are needed: -AboutConfig from http://aboutconfig.mozdev.org/ and -External Editor from http://globs.org/articles.php?lng=en&pg=8 +AboutConfig from https://mjg.github.io/AboutConfig/ and +External Editor from https://globs.org/articles.php?lng=en&pg=8 1. Prepare the patch as a text file using your method of choice. diff --git a/git-imap-send.html b/git-imap-send.html index 959a11ecc..034554ced 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -1008,7 +1008,7 @@ format=flowed) in ways that make them fail. You will get angry flames ridiculing you if you don’t check this.

Thunderbird in particular is known to be problematic. Thunderbird users may wish to visit this web page for more information: - http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email

+ https://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email

@@ -1028,7 +1028,7 @@ users may wish to visit this web page for more information: diff --git a/git-imap-send.txt b/git-imap-send.txt index f7b185151..c8a89d724 100644 --- a/git-imap-send.txt +++ b/git-imap-send.txt @@ -135,7 +135,7 @@ flames ridiculing you if you don't check this. Thunderbird in particular is known to be problematic. Thunderbird users may wish to visit this web page for more information: - http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email + https://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email SEE ALSO -------- diff --git a/git-merge-file.html b/git-merge-file.html index ab5fed58c..530ce1d13 100644 --- a/git-merge-file.html +++ b/git-merge-file.html @@ -871,6 +871,18 @@ object store and the object ID of its blob is written to standard output.

+
+--diff-algorithm={patience|minimal|histogram|myers} +
+
+

+ Use a different diff algorithm while merging. The current default is "myers", + but selecting more recent algorithm such as "histogram" can help + avoid mismerges that occur due to unimportant matching lines + (such as braces from distinct functions). See also + git-diff(1) --diff-algorithm. +

+
@@ -919,7 +931,7 @@ object store and the object ID of its blob is written to standard output.

Last updated - 2023-11-08 09:04:31 PST + 2023-12-18 14:49:41 PST
diff --git a/git-merge-file.txt b/git-merge-file.txt index 6a081eacb..71915a00f 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt @@ -92,6 +92,12 @@ object store and the object ID of its blob is written to standard output. Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines. +--diff-algorithm={patience|minimal|histogram|myers}:: + Use a different diff algorithm while merging. The current default is "myers", + but selecting more recent algorithm such as "histogram" can help + avoid mismerges that occur due to unimportant matching lines + (such as braces from distinct functions). See also + linkgit:git-diff[1] `--diff-algorithm`. EXAMPLES -------- diff --git a/git-merge.html b/git-merge.html index d5dda7ff8..821f0f67c 100644 --- a/git-merge.html +++ b/git-merge.html @@ -935,7 +935,7 @@ actual commits being merged.

the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. - (See http://developercertificate.org for the one used by the + (See https://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project. diff --git a/git-pull.html b/git-pull.html index c32ec00f8..a84a3fd97 100644 --- a/git-pull.html +++ b/git-pull.html @@ -989,7 +989,7 @@ actual commits being merged.

the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. - (See http://developercertificate.org for the one used by the + (See https://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project. diff --git a/git-remote-helpers.html b/git-remote-helpers.html index 4ee301748..732a3e327 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/git-replay.html b/git-replay.html new file mode 100644 index 000000000..f1cdc57ab --- /dev/null +++ b/git-replay.html @@ -0,0 +1,2384 @@ + + + + + + +git-replay(1) + + + + + +
+
+

SYNOPSIS

+
+
+
(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) <revision-range>…
+
+
+
+
+
+

DESCRIPTION

+
+

Takes ranges of commits and replays them onto a new location. Leaves +the working tree and the index untouched, and updates no references. +The output of this command is meant to be used as input to +git update-ref --stdin, which would update the relevant branches +(see the OUTPUT section below).

+

THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.

+
+
+
+

OPTIONS

+
+
+
+--onto <newbase> +
+
+

+ Starting point at which to create the new commits. May be any + valid commit, and not just an existing branch name. +

+

When --onto is specified, the update-ref command(s) in the output will +update the branch(es) in the revision range to point at the new +commits, similar to the way how git rebase --update-refs updates +multiple branches in the affected range.

+
+
+--advance <branch> +
+
+

+ Starting point at which to create the new commits; must be a + branch name. +

+

When --advance is specified, the update-ref command(s) in the output +will update the branch passed as an argument to --advance to point at +the new commits (in other words, this mimics a cherry-pick operation).

+
+
+<revision-range> +
+
+

+ Range of commits to replay. More than one <revision-range> can + be passed, but in --advance <branch> mode, they should have + a single tip, so that it’s clear where <branch> should point + to. See "Specifying Ranges" in linkgit:git-rev-parse and the + "Commit Limiting" options below. +

+
+
+
+

Commit Limiting

+

Besides specifying a range of commits that should be listed using the +special notations explained in the description, additional commit +limiting may be applied.

+

Using more options generally further limits the output (e.g. +--since=<date1> limits to commits newer than <date1>, and using it +with --grep=<pattern> further limits to commits whose log message +has a line that matches <pattern>), unless otherwise noted.

+

Note that these are applied before commit +ordering and formatting options, such as --reverse.

+
+
+-<number> +
+
+-n <number> +
+
+--max-count=<number> +
+
+

+ Limit the number of commits to output. +

+
+
+--skip=<number> +
+
+

+ Skip number commits before starting to show the commit output. +

+
+
+--since=<date> +
+
+--after=<date> +
+
+

+ Show commits more recent than a specific date. +

+
+
+--since-as-filter=<date> +
+
+

+ Show all commits more recent than a specific date. This visits + all commits in the range, rather than stopping at the first commit which + is older than a specific date. +

+
+
+--until=<date> +
+
+--before=<date> +
+
+

+ Show commits older than a specific date. +

+
+
+--author=<pattern> +
+
+--committer=<pattern> +
+
+

+ Limit the commits output to ones with author/committer + header lines that match the specified pattern (regular + expression). With more than one --author=<pattern>, + commits whose author matches any of the given patterns are + chosen (similarly for multiple --committer=<pattern>). +

+
+
+--grep-reflog=<pattern> +
+
+

+ Limit the commits output to ones with reflog entries that + match the specified pattern (regular expression). With + more than one --grep-reflog, commits whose reflog message + matches any of the given patterns are chosen. It is an + error to use this option unless --walk-reflogs is in use. +

+
+
+--grep=<pattern> +
+
+

+ Limit the commits output to ones with a log message that + matches the specified pattern (regular expression). With + more than one --grep=<pattern>, commits whose message + matches any of the given patterns are chosen (but see + --all-match). +

+

When --notes is in effect, the message from the notes is +matched as if it were part of the log message.

+
+
+--all-match +
+
+

+ Limit the commits output to ones that match all given --grep, + instead of ones that match at least one. +

+
+
+--invert-grep +
+
+

+ Limit the commits output to ones with a log message that do not + match the pattern specified with --grep=<pattern>. +

+
+
+-i +
+
+--regexp-ignore-case +
+
+

+ Match the regular expression limiting patterns without regard to letter + case. +

+
+
+--basic-regexp +
+
+

+ Consider the limiting patterns to be basic regular expressions; + this is the default. +

+
+
+-E +
+
+--extended-regexp +
+
+

+ Consider the limiting patterns to be extended regular expressions + instead of the default basic regular expressions. +

+
+
+-F +
+
+--fixed-strings +
+
+

+ Consider the limiting patterns to be fixed strings (don’t interpret + pattern as a regular expression). +

+
+
+-P +
+
+--perl-regexp +
+
+

+ Consider the limiting patterns to be Perl-compatible regular + expressions. +

+

Support for these types of regular expressions is an optional +compile-time dependency. If Git wasn’t compiled with support for them +providing this option will cause it to die.

+
+
+--remove-empty +
+
+

+ Stop when a given path disappears from the tree. +

+
+
+--merges +
+
+

+ Print only merge commits. This is exactly the same as --min-parents=2. +

+
+
+--no-merges +
+
+

+ Do not print commits with more than one parent. This is + exactly the same as --max-parents=1. +

+
+
+--min-parents=<number> +
+
+--max-parents=<number> +
+
+--no-min-parents +
+
+--no-max-parents +
+
+

+ Show only commits which have at least (or at most) that many parent + commits. In particular, --max-parents=1 is the same as --no-merges, + --min-parents=2 is the same as --merges. --max-parents=0 + gives all root commits and --min-parents=3 all octopus merges. +

+

--no-min-parents and --no-max-parents reset these limits (to no limit) +again. Equivalent forms are --min-parents=0 (any commit has 0 or more +parents) and --max-parents=-1 (negative numbers denote no upper limit).

+
+
+--first-parent +
+
+

+ When finding commits to include, follow only the first + parent commit upon seeing a merge commit. This option + can give a better overview when viewing the evolution of + a particular topic branch, because merges into a topic + branch tend to be only about adjusting to updated upstream + from time to time, and this option allows you to ignore + the individual commits brought in to your history by such + a merge. +

+
+
+--exclude-first-parent-only +
+
+

+ When finding commits to exclude (with a ^), follow only + the first parent commit upon seeing a merge commit. + This can be used to find the set of changes in a topic branch + from the point where it diverged from the remote branch, given + that arbitrary merges can be valid topic branch changes. +

+
+
+--not +
+
+

+ Reverses the meaning of the ^ prefix (or lack thereof) + for all following revision specifiers, up to the next --not. + When used on the command line before --stdin, the revisions passed + through stdin will not be affected by it. Conversely, when passed + via standard input, the revisions passed on the command line will + not be affected by it. +

+
+
+--all +
+
+

+ Pretend as if all the refs in refs/, along with HEAD, are + listed on the command line as <commit>. +

+
+
+--branches[=<pattern>] +
+
+

+ Pretend as if all the refs in refs/heads are listed + on the command line as <commit>. If <pattern> is given, limit + branches to ones matching given shell glob. If pattern lacks ?, + *, or [, /* at the end is implied. +

+
+
+--tags[=<pattern>] +
+
+

+ Pretend as if all the refs in refs/tags are listed + on the command line as <commit>. If <pattern> is given, limit + tags to ones matching given shell glob. If pattern lacks ?, *, + or [, /* at the end is implied. +

+
+
+--remotes[=<pattern>] +
+
+

+ Pretend as if all the refs in refs/remotes are listed + on the command line as <commit>. If <pattern> is given, limit + remote-tracking branches to ones matching given shell glob. + If pattern lacks ?, *, or [, /* at the end is implied. +

+
+
+--glob=<glob-pattern> +
+
+

+ Pretend as if all the refs matching shell glob <glob-pattern> + are listed on the command line as <commit>. Leading refs/, + is automatically prepended if missing. If pattern lacks ?, *, + or [, /* at the end is implied. +

+
+
+--exclude=<glob-pattern> +
+
+

+ Do not include refs matching <glob-pattern> that the next --all, + --branches, --tags, --remotes, or --glob would otherwise + consider. Repetitions of this option accumulate exclusion patterns + up to the next --all, --branches, --tags, --remotes, or + --glob option (other options or arguments do not clear + accumulated patterns). +

+

The patterns given should not begin with refs/heads, refs/tags, or +refs/remotes when applied to --branches, --tags, or --remotes, +respectively, and they must begin with refs/ when applied to --glob +or --all. If a trailing /* is intended, it must be given +explicitly.

+
+
+--exclude-hidden=[fetch|receive|uploadpack] +
+
+

+ Do not include refs that would be hidden by git-fetch, + git-receive-pack or git-upload-pack by consulting the appropriate + fetch.hideRefs, receive.hideRefs or uploadpack.hideRefs + configuration along with transfer.hideRefs (see + git-config(1)). This option affects the next pseudo-ref option + --all or --glob and is cleared after processing them. +

+
+
+--reflog +
+
+

+ Pretend as if all objects mentioned by reflogs are listed on the + command line as <commit>. +

+
+
+--alternate-refs +
+
+

+ Pretend as if all objects mentioned as ref tips of alternate + repositories were listed on the command line. An alternate + repository is any repository whose object directory is specified + in objects/info/alternates. The set of included objects may + be modified by core.alternateRefsCommand, etc. See + git-config(1). +

+
+
+--single-worktree +
+
+

+ By default, all working trees will be examined by the + following options when there are more than one (see + git-worktree(1)): --all, --reflog and + --indexed-objects. + This option forces them to examine the current working tree + only. +

+
+
+--ignore-missing +
+
+

+ Upon seeing an invalid object name in the input, pretend as if + the bad input was not given. +

+
+
+--bisect +
+
+

+ Pretend as if the bad bisection ref refs/bisect/bad + was listed and as if it was followed by --not and the good + bisection refs refs/bisect/good-* on the command + line. +

+
+
+--stdin +
+
+

+ In addition to getting arguments from the command line, read + them from standard input as well. This accepts commits and + pseudo-options like --all and --glob=. When a -- separator + is seen, the following input is treated as paths and used to + limit the result. Flags like --not which are read via standard input + are only respected for arguments passed in the same way and will not + influence any subsequent command line arguments. +

+
+
+--cherry-mark +
+
+

+ Like --cherry-pick (see below) but mark equivalent commits + with = rather than omitting them, and inequivalent ones with +. +

+
+
+--cherry-pick +
+
+

+ Omit any commit that introduces the same change as + another commit on the “other side” when the set of + commits are limited with symmetric difference. +

+

For example, if you have two branches, A and B, a usual way +to list all commits on only one side of them is with +--left-right (see the example below in the description of +the --left-right option). However, it shows the commits that were +cherry-picked from the other branch (for example, “3rd on b” may be +cherry-picked from branch A). With this option, such pairs of commits are +excluded from the output.

+
+
+--left-only +
+
+--right-only +
+
+

+ List only commits on the respective side of a symmetric difference, + i.e. only those which would be marked < resp. > by + --left-right. +

+

For example, --cherry-pick --right-only A...B omits those +commits from B which are in A or are patch-equivalent to a commit in +A. In other words, this lists the + commits from git cherry A B. +More precisely, --cherry-pick --right-only --no-merges gives the exact +list.

+
+
+--cherry +
+
+

+ A synonym for --right-only --cherry-mark --no-merges; useful to + limit the output to the commits on our side and mark those that + have been applied to the other side of a forked history with + git log --cherry upstream...mybranch, similar to + git cherry upstream mybranch. +

+
+
+-g +
+
+--walk-reflogs +
+
+

+ Instead of walking the commit ancestry chain, walk + reflog entries from the most recent one to older ones. + When this option is used you cannot specify commits to + exclude (that is, ^commit, commit1..commit2, + and commit1...commit2 notations cannot be used). +

+

With --pretty format other than oneline and reference (for obvious reasons), +this causes the output to have two extra lines of information +taken from the reflog. The reflog designator in the output may be shown +as ref@{Nth} (where Nth is the reverse-chronological index in the +reflog) or as ref@{timestamp} (with the timestamp for that entry), +depending on a few rules:

+
+
+
    +
  1. +

    +If the starting point is specified as ref@{Nth}, show the index + format. +

    +
    2. +
  2. +

    +If the starting point was specified as ref@{now}, show the + timestamp format. +

    +
    3. +
  3. +

    +If neither was used, but --date was given on the command line, show + the timestamp in the format requested by --date. +

    +
    4. +
  4. +

    +Otherwise, show the index format. +

    +
    5. +
+
+

Under --pretty=oneline, the commit message is +prefixed with this information on the same line. +This option cannot be combined with --reverse. +See also git-reflog(1).

+

Under --pretty=reference, this information will not be shown at all.

+
+
+--merge +
+
+

+ After a failed merge, show refs that touch files having a + conflict and don’t exist on all heads to merge. +

+
+
+--boundary +
+
+

+ Output excluded boundary commits. Boundary commits are + prefixed with -. +

+
+
+
+
+

History Simplification

+

Sometimes you are only interested in parts of the history, for example the +commits modifying a particular <path>. But there are two parts of +History Simplification, one part is selecting the commits and the other +is how to do it, as there are various strategies to simplify the history.

+

The following options select the commits to be shown:

+
+
+<paths> +
+
+

+ Commits modifying the given <paths> are selected. +

+
+
+--simplify-by-decoration +
+
+

+ Commits that are referred by some branch or tag are selected. +

+
+
+

Note that extra commits can be shown to give a meaningful history.

+

The following options affect the way the simplification is performed:

+
+
+Default mode +
+
+

+ Simplifies the history to the simplest history explaining the + final state of the tree. Simplest because it prunes some side + branches if the end result is the same (i.e. merging branches + with the same content) +

+
+
+--show-pulls +
+
+

+ Include all commits from the default mode, but also any merge + commits that are not TREESAME to the first parent but are + TREESAME to a later parent. This mode is helpful for showing + the merge commits that "first introduced" a change to a branch. +

+
+
+--full-history +
+
+

+ Same as the default mode, but does not prune some history. +

+
+
+--dense +
+
+

+ Only the selected commits are shown, plus some to have a + meaningful history. +

+
+
+--sparse +
+
+

+ All commits in the simplified history are shown. +

+
+
+--simplify-merges +
+
+

+ Additional option to --full-history to remove some needless + merges from the resulting history, as there are no selected + commits contributing to this merge. +

+
+
+--ancestry-path[=<commit>] +
+
+

+ When given a range of commits to display (e.g. commit1..commit2 + or commit2 ^commit1), only display commits in that range + that are ancestors of <commit>, descendants of <commit>, or + <commit> itself. If no commit is specified, use commit1 (the + excluded part of the range) as <commit>. Can be passed multiple + times; if so, a commit is included if it is any of the commits + given or if it is an ancestor or descendant of one of them. +

+
+
+

A more detailed explanation follows.

+

Suppose you specified foo as the <paths>. We shall call commits +that modify foo !TREESAME, and the rest TREESAME. (In a diff +filtered for foo, they look different and equal, respectively.)

+

In the following, we will always refer to the same example history to +illustrate the differences between simplification settings. We assume +that you are filtering for a file foo in this commit graph:

+
+
+
          .-A---M---N---O---P---Q
+         /     /   /   /   /   /
+        I     B   C   D   E   Y
+         \   /   /   /   /   /
+          `-------------'   X
+
+

The horizontal line of history A---Q is taken to be the first parent of +each merge. The commits are:

+
    +
  • +

    +I is the initial commit, in which foo exists with contents + “asdf”, and a file quux exists with contents “quux”. Initial + commits are compared to an empty tree, so I is !TREESAME. +

    +
    • +
  • +

    +In A, foo contains just “foo”. +

    +
    • +
  • +

    +B contains the same change as A. Its merge M is trivial and + hence TREESAME to all parents. +

    +
    • +
  • +

    +C does not change foo, but its merge N changes it to “foobar”, + so it is not TREESAME to any parent. +

    +
    • +
  • +

    +D sets foo to “baz”. Its merge O combines the strings from + N and D to “foobarbaz”; i.e., it is not TREESAME to any parent. +

    +
    • +
  • +

    +E changes quux to “xyzzy”, and its merge P combines the + strings to “quux xyzzy”. P is TREESAME to O, but not to E. +

    +
    • +
  • +

    +X is an independent root commit that added a new file side, and Y + modified it. Y is TREESAME to X. Its merge Q added side to P, and + Q is TREESAME to P, but not to Y. +

    +
    • +
+

rev-list walks backwards through history, including or excluding +commits based on whether --full-history and/or parent rewriting +(via --parents or --children) are used. The following settings +are available.

+
+
+Default mode +
+
+

+ Commits are included if they are not TREESAME to any parent + (though this can be changed, see --sparse below). If the + commit was a merge, and it was TREESAME to one parent, follow + only that parent. (Even if there are several TREESAME + parents, follow only one of them.) Otherwise, follow all + parents. +

+

This results in:

+
+
+
          .-A---N---O
+         /     /   /
+        I---------D
+
+

Note how the rule to only follow the TREESAME parent, if one is +available, removed B from consideration entirely. C was +considered via N, but is TREESAME. Root commits are compared to an +empty tree, so I is !TREESAME.

+

Parent/child relations are only visible with --parents, but that does +not affect the commits selected in default mode, so we have shown the +parent lines.

+
+
+--full-history without parent rewriting +
+
+

+ This mode differs from the default in one point: always follow + all parents of a merge, even if it is TREESAME to one of them. + Even if more than one side of the merge has commits that are + included, this does not imply that the merge itself is! In + the example, we get +

+
+
+
        I  A  B  N  D  O  P  Q
+
+

M was excluded because it is TREESAME to both parents. E, +C and B were all walked, but only B was !TREESAME, so the others +do not appear.

+

Note that without parent rewriting, it is not really possible to talk +about the parent/child relationships between the commits, so we show +them disconnected.

+
+
+--full-history with parent rewriting +
+
+

+ Ordinary commits are only included if they are !TREESAME + (though this can be changed, see --sparse below). +

+

Merges are always included. However, their parent list is rewritten: +Along each parent, prune away commits that are not included +themselves. This results in

+
+
+
          .-A---M---N---O---P---Q
+         /     /   /   /   /
+        I     B   /   D   /
+         \   /   /   /   /
+          `-------------'
+
+

Compare to --full-history without rewriting above. Note that E +was pruned away because it is TREESAME, but the parent list of P was +rewritten to contain E's parent I. The same happened for C and +N, and X, Y and Q.

+
+
+

In addition to the above settings, you can change whether TREESAME +affects inclusion:

+
+
+--dense +
+
+

+ Commits that are walked are included if they are not TREESAME + to any parent. +

+
+
+--sparse +
+
+

+ All commits that are walked are included. +

+

Note that without --full-history, this still simplifies merges: if +one of the parents is TREESAME, we follow only that one, so the other +sides of the merge are never walked.

+
+
+--simplify-merges +
+
+

+ First, build a history graph in the same way that + --full-history with parent rewriting does (see above). +

+

Then simplify each commit C to its replacement C' in the final +history according to the following rules:

+
+
+
    +
  • +

    +Set C' to C. +

    +
    • +
  • +

    +Replace each parent P of C' with its simplification P'. In + the process, drop parents that are ancestors of other parents or that are + root commits TREESAME to an empty tree, and remove duplicates, but take care + to never drop all parents that we are TREESAME to. +

    +
    • +
  • +

    +If after this parent rewriting, C' is a root or merge commit (has + zero or >1 parents), a boundary commit, or !TREESAME, it remains. + Otherwise, it is replaced with its only parent. +

    +
    • +
+
+

The effect of this is best shown by way of comparing to +--full-history with parent rewriting. The example turns into:

+
+
+
          .-A---M---N---O
+         /     /       /
+        I     B       D
+         \   /       /
+          `---------'
+
+

Note the major differences in N, P, and Q over --full-history:

+
+
+
    +
  • +

    +N's parent list had I removed, because it is an ancestor of the + other parent M. Still, N remained because it is !TREESAME. +

    +
    • +
  • +

    +P's parent list similarly had I removed. P was then + removed completely, because it had one parent and is TREESAME. +

    +
    • +
  • +

    +Q's parent list had Y simplified to X. X was then removed, because it + was a TREESAME root. Q was then removed completely, because it had one + parent and is TREESAME. +

    +
    • +
+
+
+
+

There is another simplification mode available:

+
+
+--ancestry-path[=<commit>] +
+
+

+ Limit the displayed commits to those which are an ancestor of + <commit>, or which are a descendant of <commit>, or are <commit> + itself. +

+

As an example use case, consider the following commit history:

+
+
+
            D---E-------F
+           /     \       \
+          B---C---G---H---I---J
+         /                     \
+        A-------K---------------L--M
+
+

A regular D..M computes the set of commits that are ancestors of M, +but excludes the ones that are ancestors of D. This is useful to see +what happened to the history leading to M since D, in the sense +that “what does M have that did not exist in D”. The result in this +example would be all the commits, except A and B (and D itself, +of course).

+

When we want to find out what commits in M are contaminated with the +bug introduced by D and need fixing, however, we might want to view +only the subset of D..M that are actually descendants of D, i.e. +excluding C and K. This is exactly what the --ancestry-path +option does. Applied to the D..M range, it results in:

+
+
+
                E-------F
+                 \       \
+                  G---H---I---J
+                               \
+                                L--M
+
+

We can also use --ancestry-path=D instead of --ancestry-path which +means the same thing when applied to the D..M range but is just more +explicit.

+

If we instead are interested in a given topic within this range, and all +commits affected by that topic, we may only want to view the subset of +D..M which contain that topic in their ancestry path. So, using +--ancestry-path=H D..M for example would result in:

+
+
+
                E
+                 \
+                  G---H---I---J
+                               \
+                                L--M
+
+

Whereas --ancestry-path=K D..M would result in

+
+
+
                K---------------L--M
+
+
+
+

Before discussing another option, --show-pulls, we need to +create a new example history.

+

A common problem users face when looking at simplified history is that a +commit they know changed a file somehow does not appear in the file’s +simplified history. Let’s demonstrate a new example and show how options +such as --full-history and --simplify-merges works in that case:

+
+
+
          .-A---M-----C--N---O---P
+         /     / \  \  \/   /   /
+        I     B   \  R-'`-Z'   /
+         \   /     \/         /
+          \ /      /\        /
+           `---X--'  `---Y--'
+
+

For this example, suppose I created file.txt which was modified by +A, B, and X in different ways. The single-parent commits C, Z, +and Y do not change file.txt. The merge commit M was created by +resolving the merge conflict to include both changes from A and B +and hence is not TREESAME to either. The merge commit R, however, was +created by ignoring the contents of file.txt at M and taking only +the contents of file.txt at X. Hence, R is TREESAME to X but not +M. Finally, the natural merge resolution to create N is to take the +contents of file.txt at R, so N is TREESAME to R but not C. +The merge commits O and P are TREESAME to their first parents, but +not to their second parents, Z and Y respectively.

+

When using the default mode, N and R both have a TREESAME parent, so +those edges are walked and the others are ignored. The resulting history +graph is:

+
+
+
        I---X
+
+

When using --full-history, Git walks every edge. This will discover +the commits A and B and the merge M, but also will reveal the +merge commits O and P. With parent rewriting, the resulting graph is:

+
+
+
          .-A---M--------N---O---P
+         /     / \  \  \/   /   /
+        I     B   \  R-'`--'   /
+         \   /     \/         /
+          \ /      /\        /
+           `---X--'  `------'
+
+

Here, the merge commits O and P contribute extra noise, as they did +not actually contribute a change to file.txt. They only merged a topic +that was based on an older version of file.txt. This is a common +issue in repositories using a workflow where many contributors work in +parallel and merge their topic branches along a single trunk: many +unrelated merges appear in the --full-history results.

+

When using the --simplify-merges option, the commits O and P +disappear from the results. This is because the rewritten second parents +of O and P are reachable from their first parents. Those edges are +removed and then the commits look like single-parent commits that are +TREESAME to their parent. This also happens to the commit N, resulting +in a history view as follows:

+
+
+
          .-A---M--.
+         /     /    \
+        I     B      R
+         \   /      /
+          \ /      /
+           `---X--'
+
+

In this view, we see all of the important single-parent changes from +A, B, and X. We also see the carefully-resolved merge M and the +not-so-carefully-resolved merge R. This is usually enough information +to determine why the commits A and B "disappeared" from history in +the default view. However, there are a few issues with this approach.

+

The first issue is performance. Unlike any previous option, the +--simplify-merges option requires walking the entire commit history +before returning a single result. This can make the option difficult to +use for very large repositories.

+

The second issue is one of auditing. When many contributors are working +on the same repository, it is important which merge commits introduced +a change into an important branch. The problematic merge R above is +not likely to be the merge commit that was used to merge into an +important branch. Instead, the merge N was used to merge R and X +into the important branch. This commit may have information about why +the change X came to override the changes from A and B in its +commit message.

+
+
+--show-pulls +
+
+

+ In addition to the commits shown in the default history, show + each merge commit that is not TREESAME to its first parent but + is TREESAME to a later parent. +

+

When a merge commit is included by --show-pulls, the merge is +treated as if it "pulled" the change from another branch. When using +--show-pulls on this example (and no other options) the resulting +graph is:

+
+
+
        I---X---R---N
+
+

Here, the merge commits R and N are included because they pulled +the commits X and R into the base branch, respectively. These +merges are the reason the commits A and B do not appear in the +default history.

+

When --show-pulls is paired with --simplify-merges, the +graph includes all of the necessary information:

+
+
+
          .-A---M--.   N
+         /     /    \ /
+        I     B      R
+         \   /      /
+          \ /      /
+           `---X--'
+
+

Notice that since M is reachable from R, the edge from N to M +was simplified away. However, N still appears in the history as an +important commit because it "pulled" the change R into the main +branch.

+
+
+

The --simplify-by-decoration option allows you to view only the +big picture of the topology of the history, by omitting commits +that are not referenced by tags. Commits are marked as !TREESAME +(in other words, kept after history simplification rules described +above) if (1) they are referenced by tags, or (2) they change the +contents of the paths given on the command line. All other +commits are marked as TREESAME (subject to be simplified away).

+
+
+

Commit Ordering

+

By default, the commits are shown in reverse chronological order.

+
+
+--date-order +
+
+

+ Show no parents before all of its children are shown, but + otherwise show commits in the commit timestamp order. +

+
+
+--author-date-order +
+
+

+ Show no parents before all of its children are shown, but + otherwise show commits in the author timestamp order. +

+
+
+--topo-order +
+
+

+ Show no parents before all of its children are shown, and + avoid showing commits on multiple lines of history + intermixed. +

+

For example, in a commit history like this:

+
+
+
    ---1----2----4----7
+        \              \
+         3----5----6----8---
+
+

where the numbers denote the order of commit timestamps, git +rev-list and friends with --date-order show the commits in the +timestamp order: 8 7 6 5 4 3 2 1.

+

With --topo-order, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 +3 1); some older commits are shown before newer ones in order to +avoid showing the commits from two parallel development track mixed +together.

+
+
+--reverse +
+
+

+ Output the commits chosen to be shown (see Commit Limiting + section above) in reverse order. Cannot be combined with + --walk-reflogs. +

+
+
+
+
+

Object Traversal

+

These options are mostly targeted for packing of Git repositories.

+
+
+--no-walk[=(sorted|unsorted)] +
+
+

+ Only show the given commits, but do not traverse their ancestors. + This has no effect if a range is specified. If the argument + unsorted is given, the commits are shown in the order they were + given on the command line. Otherwise (if sorted or no argument + was given), the commits are shown in reverse chronological order + by commit time. + Cannot be combined with --graph. +

+
+
+--do-walk +
+
+

+ Overrides a previous --no-walk. +

+
+
+
+
+

Commit Formatting

+
+
+--pretty[=<format>] +
+
+--format=<format> +
+
+

+ Pretty-print the contents of the commit logs in a given format, + where <format> can be one of oneline, short, medium, + full, fuller, reference, email, raw, format:<string> + and tformat:<string>. When <format> is none of the above, + and has %placeholder in it, it acts as if + --pretty=tformat:<format> were given. +

+

See the "PRETTY FORMATS" section for some additional details for each +format. When =<format> part is omitted, it defaults to medium.

+

Note: you can specify the default pretty format in the repository +configuration (see git-config(1)).

+
+
+--abbrev-commit +
+
+

+ Instead of showing the full 40-byte hexadecimal commit object + name, show a prefix that names the object uniquely. + "--abbrev=<n>" (which also modifies diff output, if it is displayed) + option can be used to specify the minimum length of the prefix. +

+

This should make "--pretty=oneline" a whole lot more readable for +people using 80-column terminals.

+
+
+--no-abbrev-commit +
+
+

+ Show the full 40-byte hexadecimal commit object name. This negates + --abbrev-commit, either explicit or implied by other options such + as "--oneline". It also overrides the log.abbrevCommit variable. +

+
+
+--oneline +
+
+

+ This is a shorthand for "--pretty=oneline --abbrev-commit" + used together. +

+
+
+--encoding=<encoding> +
+
+

+ Commit objects record the character encoding used for the log message + in their encoding header; this option can be used to tell the + command to re-code the commit log message in the encoding + preferred by the user. For non plumbing commands this + defaults to UTF-8. Note that if an object claims to be encoded + in X and we are outputting in X, we will output the object + verbatim; this means that invalid sequences in the original + commit may be copied to the output. Likewise, if iconv(3) fails + to convert the commit, we will quietly output the original + object verbatim. +

+
+
+--expand-tabs=<n> +
+
+--expand-tabs +
+
+--no-expand-tabs +
+
+

+ Perform a tab expansion (replace each tab with enough spaces + to fill to the next display column that is a multiple of <n>) + in the log message before showing it in the output. + --expand-tabs is a short-hand for --expand-tabs=8, and + --no-expand-tabs is a short-hand for --expand-tabs=0, + which disables tab expansion. +

+

By default, tabs are expanded in pretty formats that indent the log +message by 4 spaces (i.e. medium, which is the default, full, +and fuller).

+
+
+--notes[=<ref>] +
+
+

+ Show the notes (see git-notes(1)) that annotate the + commit, when showing the commit log message. This is the default + for git log, git show and git whatchanged commands when + there is no --pretty, --format, or --oneline option given + on the command line. +

+

By default, the notes shown are from the notes refs listed in the +core.notesRef and notes.displayRef variables (or corresponding +environment overrides). See git-config(1) for more details.

+

With an optional <ref> argument, use the ref to find the notes +to display. The ref can specify the full refname when it begins +with refs/notes/; when it begins with notes/, refs/ and otherwise +refs/notes/ is prefixed to form the full name of the ref.

+

Multiple --notes options can be combined to control which notes are +being displayed. Examples: "--notes=foo" will show only notes from +"refs/notes/foo"; "--notes=foo --notes" will show both notes from +"refs/notes/foo" and from the default notes ref(s).

+
+
+--no-notes +
+
+

+ Do not show notes. This negates the above --notes option, by + resetting the list of notes refs from which notes are shown. + Options are parsed in the order given on the command line, so e.g. + "--notes --notes=foo --no-notes --notes=bar" will only show notes + from "refs/notes/bar". +

+
+
+--show-notes-by-default +
+
+

+ Show the default notes unless options for displaying specific + notes are given. +

+
+
+--show-notes[=<ref>] +
+
+--[no-]standard-notes +
+
+

+ These options are deprecated. Use the above --notes/--no-notes + options instead. +

+
+
+--show-signature +
+
+

+ Check the validity of a signed commit object by passing the signature + to gpg --verify and show the output. +

+
+
+--relative-date +
+
+

+ Synonym for --date=relative. +

+
+
+--date=<format> +
+
+

+ Only takes effect for dates shown in human-readable format, such + as when using --pretty. log.date config variable sets a default + value for the log command’s --date option. By default, dates + are shown in the original time zone (either committer’s or + author’s). If -local is appended to the format (e.g., + iso-local), the user’s local time zone is used instead. +

+
+
+

--date=relative shows dates relative to the current time, +e.g. “2 hours ago”. The -local option has no effect for +--date=relative.

+

--date=local is an alias for --date=default-local.

+

--date=iso (or --date=iso8601) shows timestamps in a ISO 8601-like format. +The differences to the strict ISO 8601 format are:

+
    +
  • +

    +a space instead of the T date/time delimiter +

    +
    • +
  • +

    +a space between time and time zone +

    +
    • +
  • +

    +no colon between hours and minutes of the time zone +

    +
    • +
+

--date=iso-strict (or --date=iso8601-strict) shows timestamps in strict +ISO 8601 format.

+

--date=rfc (or --date=rfc2822) shows timestamps in RFC 2822 +format, often found in email messages.

+

--date=short shows only the date, but not the time, in YYYY-MM-DD format.

+

--date=raw shows the date as seconds since the epoch (1970-01-01 +00:00:00 UTC), followed by a space, and then the timezone as an offset +from UTC (a + or - with four digits; the first two are hours, and +the second two are minutes). I.e., as if the timestamp were formatted +with strftime("%s %z")). +Note that the -local option does not affect the seconds-since-epoch +value (which is always measured in UTC), but does switch the accompanying +timezone value.

+

--date=human shows the timezone if the timezone does not match the +current time-zone, and doesn’t print the whole date if that matches +(ie skip printing year for dates that are "this year", but also skip +the whole date itself if it’s in the last few days and we can just say +what weekday it was). For older dates the hour and minute is also +omitted.

+

--date=unix shows the date as a Unix epoch timestamp (seconds since +1970). As with --raw, this is always in UTC and therefore -local +has no effect.

+

--date=format:... feeds the format ... to your system strftime, +except for %s, %z, and %Z, which are handled internally. +Use --date=format:%c to show the date in your system locale’s +preferred format. See the strftime manual for a complete list of +format placeholders. When using -local, the correct syntax is +--date=format-local:....

+

--date=default is the default format, and is based on ctime(3) +output. It shows a single line with three-letter day of the week, +three-letter month, day-of-month, hour-minute-seconds in "HH:MM:SS" +format, followed by 4-digit year, plus timezone information, unless +the local time zone is used, e.g. Thu Jan 1 00:00:00 1970 +0000.

+
+
+
+--parents +
+
+

+ Print also the parents of the commit (in the form "commit parent…"). + Also enables parent rewriting, see History Simplification above. +

+
+
+--children +
+
+

+ Print also the children of the commit (in the form "commit child…"). + Also enables parent rewriting, see History Simplification above. +

+
+
+--left-right +
+
+

+ Mark which side of a symmetric difference a commit is reachable from. + Commits from the left side are prefixed with < and those from + the right with >. If combined with --boundary, those + commits are prefixed with -. +

+

For example, if you have this topology:

+
+
+
             y---b---b  branch B
+            / \ /
+           /   .
+          /   / \
+         o---x---a---a  branch A
+
+

you would get an output like this:

+
+
+
        $ git rev-list --left-right --boundary --pretty=oneline A...B
+
+        >bbbbbbb... 3rd on b
+        >bbbbbbb... 2nd on b
+        <aaaaaaa... 3rd on a
+        <aaaaaaa... 2nd on a
+        -yyyyyyy... 1st on b
+        -xxxxxxx... 1st on a
+
+
+
+--graph +
+
+

+ Draw a text-based graphical representation of the commit history + on the left hand side of the output. This may cause extra lines + to be printed in between commits, in order for the graph history + to be drawn properly. + Cannot be combined with --no-walk. +

+

This enables parent rewriting, see History Simplification above.

+

This implies the --topo-order option by default, but the +--date-order option may also be specified.

+
+
+--show-linear-break[=<barrier>] +
+
+

+ When --graph is not used, all history branches are flattened + which can make it hard to see that the two consecutive commits + do not belong to a linear branch. This option puts a barrier + in between them in that case. If <barrier> is specified, it + is the string that will be shown instead of the default one. +

+
+
+
+
+
+
+

OUTPUT

+
+

When there are no conflicts, the output of this command is usable as +input to git update-ref --stdin. It is of the form:

+
+
+
update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH}
+update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH}
+update refs/heads/branch3 ${NEW_branch3_HASH} ${OLD_branch3_HASH}
+
+

where the number of refs updated depends on the arguments passed and +the shape of the history being replayed. When using --advance, the +number of refs updated is always one, but for --onto, it can be one +or more (rebasing multiple branches simultaneously is supported).

+
+
+
+

EXIT STATUS

+
+

For a successful, non-conflicted replay, the exit status is 0. When +the replay has conflicts, the exit status is 1. If the replay is not +able to complete (or start) due to some kind of error, the exit status +is something other than 0 or 1.

+
+
+
+

EXAMPLES

+
+

To simply rebase mybranch onto target:

+
+
+
$ git replay --onto target origin/main..mybranch
+update refs/heads/mybranch ${NEW_mybranch_HASH} ${OLD_mybranch_HASH}
+
+

To cherry-pick the commits from mybranch onto target:

+
+
+
$ git replay --advance target origin/main..mybranch
+update refs/heads/target ${NEW_target_HASH} ${OLD_target_HASH}
+
+

Note that the first two examples replay the exact same commits and on +top of the exact same new base, they only differ in that the first +provides instructions to make mybranch point at the new commits and +the second provides instructions to make target point at them.

+

What if you have a stack of branches, one depending upon another, and +you’d really like to rebase the whole set?

+
+
+
$ git replay --contained --onto origin/main origin/main..tipbranch
+update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH}
+update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH}
+update refs/heads/tipbranch ${NEW_tipbranch_HASH} ${OLD_tipbranch_HASH}
+
+

When calling git replay, one does not need to specify a range of +commits to replay using the syntax A..B; any range expression will +do:

+
+
+
$ git replay --onto origin/main ^base branch1 branch2 branch3
+update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH}
+update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH}
+update refs/heads/branch3 ${NEW_branch3_HASH} ${OLD_branch3_HASH}
+
+

This will simultaneously rebase branch1, branch2, and branch3, +all commits they have since base, playing them on top of +origin/main. These three branches may have commits on top of base +that they have in common, but that does not need to be the case.

+
+
+
+

GIT

+
+

Part of the git(1) suite

+
+
+
+
+ + + diff --git a/git-replay.txt b/git-replay.txt new file mode 100644 index 000000000..f6c269c62 --- /dev/null +++ b/git-replay.txt @@ -0,0 +1,127 @@ +git-replay(1) +============= + +NAME +---- +git-replay - EXPERIMENTAL: Replay commits on a new base, works with bare repos too + + +SYNOPSIS +-------- +[verse] +(EXPERIMENTAL!) 'git replay' ([--contained] --onto | --advance ) ... + +DESCRIPTION +----------- + +Takes ranges of commits and replays them onto a new location. Leaves +the working tree and the index untouched, and updates no references. +The output of this command is meant to be used as input to +`git update-ref --stdin`, which would update the relevant branches +(see the OUTPUT section below). + +THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE. + +OPTIONS +------- + +--onto :: + Starting point at which to create the new commits. May be any + valid commit, and not just an existing branch name. ++ +When `--onto` is specified, the update-ref command(s) in the output will +update the branch(es) in the revision range to point at the new +commits, similar to the way how `git rebase --update-refs` updates +multiple branches in the affected range. + +--advance :: + Starting point at which to create the new commits; must be a + branch name. ++ +When `--advance` is specified, the update-ref command(s) in the output +will update the branch passed as an argument to `--advance` to point at +the new commits (in other words, this mimics a cherry-pick operation). + +:: + Range of commits to replay. More than one can + be passed, but in `--advance ` mode, they should have + a single tip, so that it's clear where should point + to. See "Specifying Ranges" in linkgit:git-rev-parse and the + "Commit Limiting" options below. + +include::rev-list-options.txt[] + +OUTPUT +------ + +When there are no conflicts, the output of this command is usable as +input to `git update-ref --stdin`. It is of the form: + + update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH} + update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH} + update refs/heads/branch3 ${NEW_branch3_HASH} ${OLD_branch3_HASH} + +where the number of refs updated depends on the arguments passed and +the shape of the history being replayed. When using `--advance`, the +number of refs updated is always one, but for `--onto`, it can be one +or more (rebasing multiple branches simultaneously is supported). + +EXIT STATUS +----------- + +For a successful, non-conflicted replay, the exit status is 0. When +the replay has conflicts, the exit status is 1. If the replay is not +able to complete (or start) due to some kind of error, the exit status +is something other than 0 or 1. + +EXAMPLES +-------- + +To simply rebase `mybranch` onto `target`: + +------------ +$ git replay --onto target origin/main..mybranch +update refs/heads/mybranch ${NEW_mybranch_HASH} ${OLD_mybranch_HASH} +------------ + +To cherry-pick the commits from mybranch onto target: + +------------ +$ git replay --advance target origin/main..mybranch +update refs/heads/target ${NEW_target_HASH} ${OLD_target_HASH} +------------ + +Note that the first two examples replay the exact same commits and on +top of the exact same new base, they only differ in that the first +provides instructions to make mybranch point at the new commits and +the second provides instructions to make target point at them. + +What if you have a stack of branches, one depending upon another, and +you'd really like to rebase the whole set? + +------------ +$ git replay --contained --onto origin/main origin/main..tipbranch +update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH} +update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH} +update refs/heads/tipbranch ${NEW_tipbranch_HASH} ${OLD_tipbranch_HASH} +------------ + +When calling `git replay`, one does not need to specify a range of +commits to replay using the syntax `A..B`; any range expression will +do: + +------------ +$ git replay --onto origin/main ^base branch1 branch2 branch3 +update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH} +update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH} +update refs/heads/branch3 ${NEW_branch3_HASH} ${OLD_branch3_HASH} +------------ + +This will simultaneously rebase `branch1`, `branch2`, and `branch3`, +all commits they have since `base`, playing them on top of +`origin/main`. These three branches may have commits on top of `base` +that they have in common, but that does not need to be the case. + +GIT +--- +Part of the linkgit:git[1] suite diff --git a/git-send-email.html b/git-send-email.html index c32eabb54..bbcda4e8d 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -1499,7 +1499,7 @@ Warn of patches that contain lines longer than 998 characters unless a suitable transfer encoding (auto, base64, or quoted-printable) is used; this is due to SMTP limits as described by - http://www.ietf.org/rfc/rfc5322.txt. + https://www.ietf.org/rfc/rfc5322.txt.

@@ -1834,7 +1834,7 @@ Authen::SASL and Mail::Address.

diff --git a/git-send-email.txt b/git-send-email.txt index 465011bad..30deb7fe2 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -454,7 +454,7 @@ have been specified, in which case default to 'compose'. 998 characters unless a suitable transfer encoding ('auto', 'base64', or 'quoted-printable') is used; this is due to SMTP limits as described by - http://www.ietf.org/rfc/rfc5322.txt. + https://www.ietf.org/rfc/rfc5322.txt. -- + Default is the value of `sendemail.validate`; if this is not set, diff --git a/git.html b/git.html index 07f4de539..714002647 100644 --- a/git.html +++ b/git.html @@ -1936,6 +1936,14 @@ repositories.

+git-replay(1) +
+
+

+ EXPERIMENTAL: Replay commits on a new base, works with bare repos too. +

+
+
git-symbolic-ref(1)
@@ -3610,9 +3618,9 @@ for full details.

avoid issues with stale commit-graphs that contain references to already-deleted commits, but comes with a performance penalty.

-

The default is "true", which enables the aforementioned behavior. -Setting this to "false" disables the existence check. This can lead to -a performance improvement at the cost of consistency.

+

The default is "false", which disables the aforementioned behavior. +Setting this to "true" enables the existence check so that stale commits +will never be returned from the commit-graph at the cost of performance.

GIT_ALLOW_PROTOCOL @@ -3788,7 +3796,7 @@ read gitcvs-migration(7).

Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list -<git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary +<git@vger.kernel.org>. https://openhub.net/p/git/contributors/summary gives you a more complete list of contributors.

If you have a clone of git.git itself, the output of git-shortlog(1) and git-blame(1) can show you @@ -3828,7 +3836,7 @@ the Git Security mailing list <

Last updated - 2023-11-08 09:04:31 PST + 2023-12-18 14:49:41 PST
diff --git a/git.txt b/git.txt index 2535a3019..4698d7a42 100644 --- a/git.txt +++ b/git.txt @@ -917,9 +917,9 @@ for full details. avoid issues with stale commit-graphs that contain references to already-deleted commits, but comes with a performance penalty. + -The default is "true", which enables the aforementioned behavior. -Setting this to "false" disables the existence check. This can lead to -a performance improvement at the cost of consistency. +The default is "false", which disables the aforementioned behavior. +Setting this to "true" enables the existence check so that stale commits +will never be returned from the commit-graph at the cost of performance. `GIT_ALLOW_PROTOCOL`:: If set to a colon-separated list of protocols, behave as if @@ -1071,7 +1071,7 @@ Authors ------- Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list -. http://www.openhub.net/p/git/contributors/summary +. https://openhub.net/p/git/contributors/summary gives you a more complete list of contributors. If you have a clone of git.git itself, the diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 8821f1d40..0fdcae901 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html @@ -1815,7 +1815,7 @@ the remote repository URL in the local repository’s config file like this:

-
$ git config remote.linus.url http://www.kernel.org/pub/scm/git/git.git/
+
$ git config remote.linus.url https://git.kernel.org/pub/scm/git/git.git/

and use the "linus" keyword with git pull instead of the full URL.

Examples.

@@ -2458,7 +2458,7 @@ to follow, not easier.

diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt index c0b95256c..2122aeb97 100644 --- a/gitcore-tutorial.txt +++ b/gitcore-tutorial.txt @@ -1089,7 +1089,7 @@ the remote repository URL in the local repository's config file like this: ------------------------------------------------ -$ git config remote.linus.url http://www.kernel.org/pub/scm/git/git.git/ +$ git config remote.linus.url https://git.kernel.org/pub/scm/git/git.git/ ------------------------------------------------ and use the "linus" keyword with 'git pull' instead of the full URL. diff --git a/gitprotocol-http.html b/gitprotocol-http.html index 0285551f6..90e7dac1d 100644 --- a/gitprotocol-http.html +++ b/gitprotocol-http.html @@ -1257,8 +1257,8 @@ update = old_id SP new_id SP name

REFERENCES

-

RFC 1738: Uniform Resource Locators (URL) -RFC 2616: Hypertext Transfer Protocol — HTTP/1.1

+

RFC 1738: Uniform Resource Locators (URL) +RFC 2616: Hypertext Transfer Protocol — HTTP/1.1

@@ -1279,7 +1279,7 @@ update = old_id SP new_id SP name diff --git a/gitprotocol-http.txt b/gitprotocol-http.txt index 21b73b7a1..836b3490c 100644 --- a/gitprotocol-http.txt +++ b/gitprotocol-http.txt @@ -529,8 +529,8 @@ TODO: Document this further. REFERENCES ---------- -http://www.ietf.org/rfc/rfc1738.txt[RFC 1738: Uniform Resource Locators (URL)] -http://www.ietf.org/rfc/rfc2616.txt[RFC 2616: Hypertext Transfer Protocol -- HTTP/1.1] +https://www.ietf.org/rfc/rfc1738.txt[RFC 1738: Uniform Resource Locators (URL)] +https://www.ietf.org/rfc/rfc2616.txt[RFC 2616: Hypertext Transfer Protocol -- HTTP/1.1] SEE ALSO -------- diff --git a/gitweb.conf.html b/gitweb.conf.html index 9369a341b..fb81c891a 100644 --- a/gitweb.conf.html +++ b/gitweb.conf.html @@ -1014,7 +1014,7 @@ $highlight_bin

Path to the highlight executable to use (it must be the one from - http://www.andre-simon.de due to assumptions about parameters and output). + http://andre-simon.de/zip/download.php due to assumptions about parameters and output). By default set to highlight; set it to full path to highlight executable if it is not installed on your web server’s PATH. Note that highlight feature must be set for gitweb to actually @@ -1795,7 +1795,7 @@ expands to the project name, %f to the project path within the filesystem (i.e. "$projectroot/$project"), %h to the current hash ('h’ gitweb parameter) and ‘%b` to the current hash base ('hb’ gitweb parameter); ‘%%` expands to '%’.

-

For example, at the time this page was written, the http://repo.or.cz +

For example, at the time this page was written, the https://repo.or.cz Git hosting site set it to the following to enable graphical log (using the third party tool git-browser):

@@ -2015,7 +2015,7 @@ gitweb_config.perl diff --git a/gitweb.conf.txt b/gitweb.conf.txt index b078fef6f..59fc1d274 100644 --- a/gitweb.conf.txt +++ b/gitweb.conf.txt @@ -242,7 +242,7 @@ $mimetypes_file:: $highlight_bin:: Path to the highlight executable to use (it must be the one from - http://www.andre-simon.de[] due to assumptions about parameters and output). + http://andre-simon.de/zip/download.php[] due to assumptions about parameters and output). By default set to 'highlight'; set it to full path to highlight executable if it is not installed on your web server's PATH. Note that 'highlight' feature must be set for gitweb to actually @@ -820,7 +820,7 @@ filesystem (i.e. "$projectroot/$project"), `%h` to the current hash (\'h' gitweb parameter) and `%b` to the current hash base (\'hb' gitweb parameter); `%%` expands to \'%'. + -For example, at the time this page was written, the http://repo.or.cz[] +For example, at the time this page was written, the https://repo.or.cz[] Git hosting site set it to the following to enable graphical log (using the third party tool *git-browser*): + diff --git a/gitweb.html b/gitweb.html index d9c01c75c..ad20864ae 100644 --- a/gitweb.html +++ b/gitweb.html @@ -802,7 +802,7 @@ Finding commits whose commit messages match a given search term.

-

See http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/ for gitweb source code, +

See https://repo.or.cz/w/git.git/tree/HEAD:/gitweb/ for gitweb source code, browsed using gitweb itself.

@@ -1642,7 +1642,7 @@ putting "gitweb" in the subject of email.

diff --git a/gitweb.txt b/gitweb.txt index 1030e9667..ddd4a0fc7 100644 --- a/gitweb.txt +++ b/gitweb.txt @@ -28,7 +28,7 @@ Gitweb provides a web interface to Git repositories. Its features include: revisions one at a time, viewing the history of the repository. * Finding commits whose commit messages match a given search term. -See http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code, +See https://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code, browsed using gitweb itself. diff --git a/howto-index.html b/howto-index.html index 193454784..5ceda6759 100644 --- a/howto-index.html +++ b/howto-index.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -896,7 +896,7 @@ later validate it.

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 85f1a789d..9814cb11c 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -1038,7 +1038,7 @@ Thanks, diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index ed65deed1..59bcc9de1 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -931,7 +931,7 @@ tip of your master again and redo the two merges:

\ / B0--B1---------B2
-

See also http://git-blame.blogspot.com/2013/09/fun-with-first-parent-history.html

+

See also https://git-blame.blogspot.com/2013/09/fun-with-first-parent-history.html

@@ -939,7 +939,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/keep-canonical-history-correct.txt b/howto/keep-canonical-history-correct.txt index 35d48ef71..5f800fd85 100644 --- a/howto/keep-canonical-history-correct.txt +++ b/howto/keep-canonical-history-correct.txt @@ -213,4 +213,4 @@ The procedure will result in a history that looks like this: B0--B1---------B2 ------------ -See also http://git-blame.blogspot.com/2013/09/fun-with-first-parent-history.html +See also https://git-blame.blogspot.com/2013/09/fun-with-first-parent-history.html diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 78775397a..27dee5266 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1479,7 +1479,7 @@ $ git update-ref -d $mf/ai/topic diff --git a/howto/new-command.html b/howto/new-command.html index 84f8bbc27..9a5afd8d9 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -864,7 +864,7 @@ letter [PATCH 0/n]. diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 318e7d2ce..37262fbce 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -896,7 +896,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index b4ac28e4f..72cfac317 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -848,7 +848,7 @@ This is still crude and does not protect against simultaneous diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 4b0278004..19de825f3 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -881,7 +881,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 286590845..96623e0d3 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1190,7 +1190,7 @@ int main(int argc, char **argv) diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 3d5bc8abd..0330b47b1 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1026,7 +1026,7 @@ P---o---o---M---x---x---W---x---M2 diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index b530fd2af..ba8754cd3 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -908,7 +908,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index f6fd68cda..10aa84134 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -842,7 +842,7 @@ o---o"master" diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 5c4cd343f..c36597305 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1072,7 +1072,7 @@ help diagnosing the problem, but removes security checks.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index a677b8772..280385599 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -931,7 +931,7 @@ that JC can make non-fast-forward pushes on it.

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index bc92e5638..2be341d45 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -792,7 +792,7 @@ a good practice to put the paths after a "--" separator.

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 109815475..bf46f50d7 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -849,7 +849,7 @@ Please note that if the other project merges from you, then it will diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index b5743ec25..5ca970838 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -953,7 +953,7 @@ as part of the merge commit.

diff --git a/signoff-option.txt b/signoff-option.txt index 12aa2333e..d98758f3c 100644 --- a/signoff-option.txt +++ b/signoff-option.txt @@ -9,7 +9,7 @@ endif::git-commit[] the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. - (See http://developercertificate.org for the one used by the + (See https://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project. diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index 95f34ee7c..e74b7d274 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-index.html b/technical/api-index.html index 8ced06053..bfec6574d 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-merge.html b/technical/api-merge.html index eb1fc7628..b97b89faa 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index c11b77419..3558d57e7 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index ffedaac8d..61ea31d95 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-trace2.html b/technical/api-trace2.html index aa7511234..cf97afdf6 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index 56ef54fe7..443fbc4a1 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index db8d5f1cf..e65d8b2fd 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 1c1541a23..ce602f952 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index dc77d3697..8c1f9c463 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 66e4c80e0..0e7d42fba 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index 8a19c9602..b701ee414 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index 8c84be746..a5b2fc1e2 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/partial-clone.html b/technical/partial-clone.html index 39dc073bf..778f507c4 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/racy-git.html b/technical/racy-git.html index ca4b7a00d..f72906db6 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/scalar.html b/technical/scalar.html index 0bd4bb2bf..e0a963ef9 100644 --- a/technical/scalar.html +++ b/technical/scalar.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index d4bb0d611..fea4c1a8a 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/shallow.html b/technical/shallow.html index 7e79cf3ed..e78228909 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 657ca4470..b9b523e8a 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/unit-tests.html b/technical/unit-tests.html index 45a9cd45a..971521a7d 100644 --- a/technical/unit-tests.html +++ b/technical/unit-tests.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/user-manual.html b/user-manual.html index 0050db0d5..266e916ea 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,5 +1,5 @@ -Git User Manual

Git User Manual

Revision History
2023-12-09

Table of Contents

Introduction
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
How to get a Git repository with minimal history
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
Using interactive rebases
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-tracking 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
Git explained
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
Todo list

Introduction

Git is a fast distributed revision control system.

This manual is designed to be readable by someone with basic UNIX +Git User Manual

Git User Manual

Revision History
2023-12-18

Table of Contents

Introduction
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
How to get a Git repository with minimal history
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
Using interactive rebases
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-tracking 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
Git explained
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
Todo list

Introduction

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 -- cgit 1.2.3-korg