diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-02 14:05:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 14:05:05 -0800 |
| commit | df3d3cddff51ef14a454394a9977e899f72b8244 (patch) | |
| tree | b6f9a3c1f550494dd1bb439f3b1cb05067ce621a | |
| parent | b8e9cfb64bf7192e3861ff1b72d169e7d1554be9 (diff) | |
| download | git-htmldocs-df3d3cddff51ef14a454394a9977e899f72b8244.tar.gz | |
Autogenerated HTML docs for v2.29.2-154-g7f7eb
57 files changed, 442 insertions, 178 deletions
diff --git a/MyFirstContribution.html b/MyFirstContribution.html index 61bc5f4f0..9ad367c9a 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -991,7 +991,7 @@ component you’re working on, followed by a blank line (always required) an the body of your commit message, which should provide the bulk of the context.
Remember to be explicit and provide the "Why" of your change, especially if it
couldn’t easily be understood from your diff. When editing your commit message,
-don’t remove the Signed-off-by line which was added by <code>-s</code> above.</p></div>
+don’t remove the <code>Signed-off-by</code> trailer which was added by <code>-s</code> above.</p></div>
<div class="listingblock">
<div class="content">
<pre><code>psuh: add a built-in by popular demand
@@ -1224,6 +1224,15 @@ your command took arguments. Try to use well-established manpage headers so your documentation is consistent with other Git and UNIX manpages; this makes life
easier for your user, who can skip to the section they know contains the
information they need.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">Before trying to build the docs, make sure you have the package <code>asciidoc</code>
+installed.</td>
+</tr></table>
+</div>
<div class="paragraph"><p>Now that you’ve written your manpage, you’ll need to build it explicitly. We
convert your AsciiDoc to troff which is man-readable like so:</p></div>
<div class="listingblock">
@@ -1237,14 +1246,6 @@ $ man Documentation/git-psuh.1</code></pre> <pre><code>$ make -C Documentation/ git-psuh.1
$ man Documentation/git-psuh.1</code></pre>
</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">You may need to install the package <code>asciidoc</code> to get this to work.</td>
-</tr></table>
-</div>
<div class="paragraph"><p>While this isn’t as satisfying as running through <code>git help</code>, you can at least
check that your help page looks right.</p></div>
<div class="paragraph"><p>You can also check that the documentation coverage is good (that is, the project
@@ -1899,7 +1900,7 @@ should generate your diffs from <code><topic>..<mybranch></code> and <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-27 14:26:53 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/MyFirstContribution.txt b/MyFirstContribution.txt index 4f85a089e..60eed5edc 100644 --- a/MyFirstContribution.txt +++ b/MyFirstContribution.txt @@ -249,7 +249,7 @@ component you're working on, followed by a blank line (always required) and then the body of your commit message, which should provide the bulk of the context. Remember to be explicit and provide the "Why" of your change, especially if it couldn't easily be understood from your diff. When editing your commit message, -don't remove the Signed-off-by line which was added by `-s` above. +don't remove the `Signed-off-by` trailer which was added by `-s` above. ---- psuh: add a built-in by popular demand @@ -507,6 +507,9 @@ documentation is consistent with other Git and UNIX manpages; this makes life easier for your user, who can skip to the section they know contains the information they need. +NOTE: Before trying to build the docs, make sure you have the package `asciidoc` +installed. + Now that you've written your manpage, you'll need to build it explicitly. We convert your AsciiDoc to troff which is man-readable like so: @@ -522,8 +525,6 @@ $ make -C Documentation/ git-psuh.1 $ man Documentation/git-psuh.1 ---- -NOTE: You may need to install the package `asciidoc` to get this to work. - While this isn't as satisfying as running through `git help`, you can at least check that your help page looks right. diff --git a/RelNotes/2.30.0.txt b/RelNotes/2.30.0.txt index 5e65d04de..cfceb1f6c 100644 --- a/RelNotes/2.30.0.txt +++ b/RelNotes/2.30.0.txt @@ -34,11 +34,39 @@ UI, Workflows & Features * "git checkout" learned to use checkout.guess configuration variable and enable/disable its "--[no-]guess" option accordingly. + * "git resurrect" script (in contrib/) learned that the object names + may be longer than 40-hex depending on the hash function in use. + + * "git diff A...B" learned "git diff --merge-base A B", which is a + longer short-hand to say the same thing. + + * A sample 'push-to-checkout' hook, that performs the same as + what the built-in default action does, has been added. + + * "git diff" family of commands learned the "-I<regex>" option to + ignore hunks whose changed lines all match the given pattern. + + * The userdiff pattern learned to identify the function definition in + POSIX shells and bash. + Performance, Internal Implementation, Development Support etc. * Use "git archive" more to produce the release tarball. + * GitHub Actions automated test improvement to skip tests on a tree + identical to what has already been tested. + + * Test-coverage for running commit-graph task "git maintenance" has + been extended. + + * Our test scripts can be told to run only individual pieces while + skipping others with the "--run=..." option; they were taught to + take a substring of test title, in addition to numbers, to name the + test pieces to run. + + * Adjust tests so that they won't scream when the default initial + branch name is changed to 'main'. Fixes since v2.29 @@ -54,7 +82,64 @@ Fixes since v2.29 commits A and B. (merge 35166b1fb5 dl/checkout-p-merge-base later to maint). + * The side-band status report can be sent at the same time as the + primary payload multiplexed, but the demultiplexer on the receiving + end incorrectly split a single status report into two, which has + been corrected. + (merge 712b0377db js/avoid-split-sideband-message later to maint). + + * "git fast-import" wasted a lot of memory when many marks were in use. + (merge 3f018ec716 jk/fast-import-marks-alloc-fix later to maint). + + * A test helper "test_cmp A B" was taught to diagnose missing files A + or B as a bug in test, but some tests legitimately wanted to notice + a failure to even create file B as an error, in addition to leaving + the expected result in it, and were misdiagnosed as a bug. This + has been corrected. + (merge 262d5ad5a5 es/test-cmp-typocatcher later to maint). + + * When "git commit-graph" detects the same commit recorded more than + once while it is merging the layers, it used to die. The code now + ignores all but one of them and continues. + (merge 85102ac71b ds/commit-graph-merging-fix later to maint). + + * The meaning of a Signed-off-by trailer can vary from project to + project; this and also what it means to this project has been + clarified in the documentation. + (merge 3abd4a67d9 bk/sob-dco later to maint). + + * "git credential' didn't honor the core.askPass configuration + variable (among other things), which has been corrected. + (merge 567ad2c0f9 tk/credential-config later to maint). + + * Dev support to catch a tentative definition of a variable in our C + code as an error. + (merge 5539183622 jk/no-common later to maint). + + * "git rebase --rebase-merges" did not correctly pass --gpg-sign + command line option to underlying "git merge" when replaying a merge + using non-default merge strategy or when replaying an octopus merge + (because replaying a two-head merge with the default strategy was + done in a separate codepath, the problem did not trigger for most + users), which has been corrected. + (merge 43ad4f2eca sc/sequencer-gpg-octopus later to maint). + + * "git apply -R" did not handle patches that touch the same path + twice correctly, which has been corrected. This is most relevant + in a patch that changes a path from a regular file to a symbolic + link (and vice versa). + (merge b0f266de11 jt/apply-reverse-twice later to maint). + + * A recent oid->hash conversion missed one spot, breaking "git svn". + (merge 03bb366de4 bc/svn-hash-oid-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 3e0a5dc9af cc/doc-filter-branch-typofix later to maint). (merge 32c83afc2c cw/ci-ghwf-check-ws-errors later to maint). (merge 5eb2ed691b rs/tighten-callers-of-deref-tag later to maint). + (merge 6db29ab213 jk/fast-import-marks-cleanup later to maint). + (merge e5cf6d3df4 nk/dir-c-comment-update later to maint). + (merge 5710dcce74 jk/report-fn-typedef later to maint). + (merge 9a82db1056 en/sequencer-rollback-lock-cleanup later to maint). + (merge 4e1bee9a99 js/t7006-cleanup later to maint). + (merge f5bcde6c58 es/tutorial-mention-asciidoc-early later to maint). diff --git a/SubmittingPatches.html b/SubmittingPatches.html index ec95231ae..62e15bc1b 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -946,7 +946,7 @@ thread to help readers find all parts of the series. To that end, send them as replies to either an additional "cover letter" message
(see below), the first patch, or the respective preceding patch.</p></div>
<div class="paragraph"><p>If your log message (including your name on the
-Signed-off-by line) is not writable in ASCII, make sure that
+<code>Signed-off-by</code> trailer) is not writable in ASCII, make sure that
you send off a message in the correct encoding.</p></div>
<div class="admonitionblock">
<table><tr>
@@ -970,7 +970,7 @@ previously sent.</p></div> <div class="paragraph"><p>The <code>git format-patch</code> command follows the best current practice to
format the body of an e-mail message. At the beginning of the
patch should come your commit message, ending with the
-Signed-off-by: lines, and a line that consists of three dashes,
+<code>Signed-off-by</code> trailers, and a line that consists of three dashes,
followed by the diffstat information and the patch itself. If
you are forwarding a patch from somebody else, optionally, at
the beginning of the e-mail message just before the commit
@@ -1016,22 +1016,21 @@ people who are involved in the area you are touching (the <code>git contacts</code> command in <code>contrib/contacts/</code> can help to
identify them), to solicit comments and reviews.</p></div>
<div class="paragraph"><p>After the list reached a consensus that it is a good idea to apply the
-patch, re-send it with "To:" set to the maintainer<span class="footnote"><br />[The current maintainer: <a href="mailto:gitster@pobox.com">gitster@pobox.com</a>]<br /></span> and "cc:" the
-list<span class="footnote"><br />[The mailing list: <a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>]<br /></span> for inclusion.</p></div>
+patch, re-send it with "To:" set to the maintainer<span class="footnote"><br />[The current maintainer: <a href="mailto:gitster@pobox.com">gitster@pobox.com</a>]<br /></span>
+and "cc:" the list<span class="footnote"><br />[The mailing list: <a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>]<br /></span> for inclusion. This is especially relevant
+when the maintainer did not heavily participate in the discussion and
+instead left the review to trusted others.</p></div>
<div class="paragraph"><p>Do not forget to add trailers such as <code>Acked-by:</code>, <code>Reviewed-by:</code> and
<code>Tested-by:</code> lines as necessary to credit people who helped your
-patch.</p></div>
+patch, and "cc:" them when sending such a final version for inclusion.</p></div>
</div>
<div class="sect2">
-<h3 id="sign-off">Certify your work by adding your "Signed-off-by: " line</h3>
-<div class="paragraph"><p>To improve tracking of who did what, we’ve borrowed the
-"sign-off" procedure from the Linux kernel project on patches
-that are being emailed around. Although core Git is a lot
-smaller project it is a good discipline to follow it.</p></div>
-<div class="paragraph"><p>The sign-off is a simple line at the end of the explanation for
-the patch, which certifies that you wrote it or otherwise have
-the right to pass it on as an open-source patch. The rules are
-pretty simple: if you can certify the below D-C-O:</p></div>
+<h3 id="sign-off">Certify your work by adding your <code>Signed-off-by</code> trailer</h3>
+<div class="paragraph"><p>To improve tracking of who did what, we ask you to certify that you
+wrote the patch or have the right to pass it on under the same license
+as ours, by "signing off" your patch. Without sign-off, we cannot
+accept your patches.</p></div>
+<div class="paragraph"><p>If you can certify the below D-C-O:</p></div>
<div class="quoteblock" id="dco">
<div class="title">Developer’s Certificate of Origin 1.1</div>
<div class="content">
@@ -1075,19 +1074,24 @@ I understand and agree that this project and the contribution </div>
<div class="attribution">
</div></div>
-<div class="paragraph"><p>then you just add a line saying</p></div>
+<div class="paragraph"><p>you add a "Signed-off-by" trailer to your commit, that looks like
+this:</p></div>
<div class="literalblock">
<div class="content">
<pre><code> Signed-off-by: Random J Developer <random@developer.example.org></code></pre>
</div></div>
-<div class="paragraph"><p>This line can be automatically added by Git if you run the git-commit
-command with the -s option.</p></div>
-<div class="paragraph"><p>Notice that you can place your own Signed-off-by: line when
+<div class="paragraph"><p>This line can be added by Git if you run the git-commit command with
+the -s option.</p></div>
+<div class="paragraph"><p>Notice that you can place your own <code>Signed-off-by</code> trailer when
forwarding somebody else’s patch with the above rules for
D-C-O. Indeed you are encouraged to do so. Do not forget to
place an in-body "From: " line at the beginning to properly attribute
the change to its true author (see (2) above).</p></div>
-<div class="paragraph" id="real-name"><p>Also notice that a real name is used in the Signed-off-by: line. Please
+<div class="paragraph"><p>This procedure originally came from the Linux kernel project, so our
+rule is quite similar to theirs, but what exactly it means to sign-off
+your patch differs from project to project, so it may be different
+from that of the project you are accustomed to.</p></div>
+<div class="paragraph" id="real-name"><p>Also notice that a real name is used in the <code>Signed-off-by</code> trailer. Please
don’t hide your real name.</p></div>
<div class="paragraph" id="commit-trailers"><p>If you like, you can put extra tags at the end:</p></div>
<div class="olist arabic"><ol class="arabic">
@@ -1389,7 +1393,7 @@ this problem around.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-19 10:37:03 PDT
+ 2020-11-02 14:02:24 PST
</div>
</div>
</body>
diff --git a/SubmittingPatches.txt b/SubmittingPatches.txt index 291b61e26..d12094bac 100644 --- a/SubmittingPatches.txt +++ b/SubmittingPatches.txt @@ -209,7 +209,7 @@ send them as replies to either an additional "cover letter" message (see below), the first patch, or the respective preceding patch. If your log message (including your name on the -Signed-off-by line) is not writable in ASCII, make sure that +`Signed-off-by` trailer) is not writable in ASCII, make sure that you send off a message in the correct encoding. WARNING: Be wary of your MUAs word-wrap @@ -229,7 +229,7 @@ previously sent. The `git format-patch` command follows the best current practice to format the body of an e-mail message. At the beginning of the patch should come your commit message, ending with the -Signed-off-by: lines, and a line that consists of three dashes, +`Signed-off-by` trailers, and a line that consists of three dashes, followed by the diffstat information and the patch itself. If you are forwarding a patch from somebody else, optionally, at the beginning of the e-mail message just before the commit @@ -290,25 +290,24 @@ identify them), to solicit comments and reviews. :git-ml: footnote:[The mailing list: git@vger.kernel.org] After the list reached a consensus that it is a good idea to apply the -patch, re-send it with "To:" set to the maintainer{current-maintainer} and "cc:" the -list{git-ml} for inclusion. +patch, re-send it with "To:" set to the maintainer{current-maintainer} +and "cc:" the list{git-ml} for inclusion. This is especially relevant +when the maintainer did not heavily participate in the discussion and +instead left the review to trusted others. Do not forget to add trailers such as `Acked-by:`, `Reviewed-by:` and `Tested-by:` lines as necessary to credit people who helped your -patch. +patch, and "cc:" them when sending such a final version for inclusion. [[sign-off]] -=== Certify your work by adding your "Signed-off-by: " line +=== Certify your work by adding your `Signed-off-by` trailer -To improve tracking of who did what, we've borrowed the -"sign-off" procedure from the Linux kernel project on patches -that are being emailed around. Although core Git is a lot -smaller project it is a good discipline to follow it. +To improve tracking of who did what, we ask you to certify that you +wrote the patch or have the right to pass it on under the same license +as ours, by "signing off" your patch. Without sign-off, we cannot +accept your patches. -The sign-off is a simple line at the end of the explanation for -the patch, which certifies that you wrote it or otherwise have -the right to pass it on as an open-source patch. The rules are -pretty simple: if you can certify the below D-C-O: +If you can certify the below D-C-O: [[dco]] .Developer's Certificate of Origin 1.1 @@ -338,23 +337,29 @@ d. I understand and agree that this project and the contribution this project or the open source license(s) involved. ____ -then you just add a line saying +you add a "Signed-off-by" trailer to your commit, that looks like +this: .... Signed-off-by: Random J Developer <random@developer.example.org> .... -This line can be automatically added by Git if you run the git-commit -command with the -s option. +This line can be added by Git if you run the git-commit command with +the -s option. -Notice that you can place your own Signed-off-by: line when +Notice that you can place your own `Signed-off-by` trailer when forwarding somebody else's patch with the above rules for D-C-O. Indeed you are encouraged to do so. Do not forget to place an in-body "From: " line at the beginning to properly attribute the change to its true author (see (2) above). +This procedure originally came from the Linux kernel project, so our +rule is quite similar to theirs, but what exactly it means to sign-off +your patch differs from project to project, so it may be different +from that of the project you are accustomed to. + [[real-name]] -Also notice that a real name is used in the Signed-off-by: line. Please +Also notice that a real name is used in the `Signed-off-by` trailer. Please don't hide your real name. [[commit-trailers]] diff --git a/diff-options.txt b/diff-options.txt index 573fb9bb7..ee52b65e4 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -687,6 +687,11 @@ endif::git-format-patch[] --ignore-blank-lines:: Ignore changes whose lines are all blank. +-I<regex>:: +--ignore-matching-lines=<regex>:: + Ignore changes whose all lines match <regex>. This option may + be specified more than once. + --inter-hunk-context=<lines>:: Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. diff --git a/git-am.html b/git-am.html index 11c794fb6..648112846 100644 --- a/git-am.html +++ b/git-am.html @@ -791,7 +791,7 @@ current branch.</p></div> </dt>
<dd>
<p>
- Add a <code>Signed-off-by:</code> line to the commit message, using
+ Add a <code>Signed-off-by</code> trailer to the commit message, using
the committer identity of yourself.
See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.
</p>
@@ -1198,7 +1198,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-04-22 14:37:28 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-am.txt b/git-am.txt index 38c085213..06bc06354 100644 --- a/git-am.txt +++ b/git-am.txt @@ -33,7 +33,7 @@ OPTIONS -s:: --signoff:: - Add a `Signed-off-by:` line to the commit message, using + Add a `Signed-off-by` trailer to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information. diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 137cd7120..4390f65cd 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -916,7 +916,7 @@ effect to your index in a row.</p></div> </dt>
<dd>
<p>
- Add Signed-off-by line at the end of the commit message.
+ Add a <code>Signed-off-by</code> trailer at the end of the commit message.
See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.
</p>
</dd>
@@ -1212,7 +1212,7 @@ try to apply the change introduced by <code>topic^</code> again, <div id="footer">
<div id="footer-text">
Last updated
- 2020-04-22 14:37:28 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 75feeef08..5d750314b 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -104,7 +104,7 @@ effect to your index in a row. -s:: --signoff:: - Add Signed-off-by line at the end of the commit message. + Add a `Signed-off-by` trailer at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information. -S[<keyid>]:: diff --git a/git-commit-graph.html b/git-commit-graph.html index 9afc0cab8..de21e2ae7 100644 --- a/git-commit-graph.html +++ b/git-commit-graph.html @@ -801,7 +801,9 @@ git-commit-graph(1) Manual Page </dt>
<dd>
<p>
-Write a commit-graph file based on the commits found in packfiles.
+Write a commit-graph file based on the commits found in packfiles. If
+the config option <code>core.commitGraph</code> is disabled, then this command will
+output a warning, then return success without writing a commit-graph file.
</p>
<div class="paragraph"><p>With the <code>--stdin-packs</code> option, generate the new commit graph by
walking objects only in the specified pack-indexes. (Cannot be combined
@@ -938,7 +940,7 @@ Write a commit-graph file containing all commits in the current <div id="footer">
<div id="footer-text">
Last updated
- 2020-09-29 14:47:55 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-commit-graph.txt b/git-commit-graph.txt index de6b6de23..e1f48c95b 100644 --- a/git-commit-graph.txt +++ b/git-commit-graph.txt @@ -39,7 +39,9 @@ COMMANDS -------- 'write':: -Write a commit-graph file based on the commits found in packfiles. +Write a commit-graph file based on the commits found in packfiles. If +the config option `core.commitGraph` is disabled, then this command will +output a warning, then return success without writing a commit-graph file. + With the `--stdin-packs` option, generate the new commit graph by walking objects only in the specified pack-indexes. (Cannot be combined diff --git a/git-commit.html b/git-commit.html index 841c06017..74f20e435 100644 --- a/git-commit.html +++ b/git-commit.html @@ -1030,15 +1030,24 @@ that, you can recover from it with <em>git reset</em>.</p></div> <dt class="hdlist1">
--signoff
</dt>
+<dt class="hdlist1">
+--no-signoff
+</dt>
<dd>
<p>
- Add Signed-off-by line by the committer at the end of the commit
- log message. The meaning of a signoff depends on the project,
- but it typically certifies that committer has
- the rights to submit this work under the same license and
- agrees to a Developer Certificate of Origin
- (see <a href="http://developercertificate.org/">http://developercertificate.org/</a> for more information).
+ Add a <code>Signed-off-by</code> trailer by the committer at the end of the commit
+ log message. The meaning of a signoff depends on the project
+ to which you’re committing. For example, it may certify that
+ 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 <a href="http://developercertificate.org">http://developercertificate.org</a> 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.
</p>
+<div class="paragraph"><p>The --no-signoff option can be used to countermand an earlier --signoff
+option on the command line.</p></div>
</dd>
<dt class="hdlist1">
-n
@@ -1723,7 +1732,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-04-22 14:37:28 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-commit.txt b/git-commit.txt index a3baea32a..17150fa7e 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -59,6 +59,7 @@ commit by giving the same set of parameters (options and paths). If you make a commit and then find a mistake immediately after that, you can recover from it with 'git reset'. +:git-commit: 1 OPTIONS ------- @@ -163,14 +164,7 @@ The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`. message, the commit is aborted. This has no effect when a message is given by other means, e.g. with the `-m` or `-F` options. --s:: ---signoff:: - Add Signed-off-by line by the committer at the end of the commit - log message. The meaning of a signoff depends on the project, - but it typically certifies that committer has - the rights to submit this work under the same license and - agrees to a Developer Certificate of Origin - (see http://developercertificate.org/ for more information). +include::signoff-option.txt[] -n:: --no-verify:: diff --git a/git-config.html b/git-config.html index 765de43be..0972539db 100644 --- a/git-config.html +++ b/git-config.html @@ -4981,7 +4981,7 @@ format.signOff <dd>
<p>
A boolean value which lets you enable the <code>-s/--signoff</code> option of
- format-patch by default. <strong>Note:</strong> Adding the Signed-off-by: line to a
+ format-patch by default. <strong>Note:</strong> Adding the <code>Signed-off-by</code> trailer to a
patch should be a conscious act and means that you certify you have
the rights to submit this work under the same open source license.
Please see the <em>SubmittingPatches</em> document for further discussion.
diff --git a/git-diff-files.html b/git-diff-files.html index de220b332..d8bd8fe67 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -1860,6 +1860,18 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </p>
</dd>
<dt class="hdlist1">
+-I<regex>
+</dt>
+<dt class="hdlist1">
+--ignore-matching-lines=<regex>
+</dt>
+<dd>
+<p>
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=<lines>
</dt>
<dd>
diff --git a/git-diff-index.html b/git-diff-index.html index 9f8d854fa..fa2765926 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -749,7 +749,7 @@ git-diff-index(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git diff-index</em> [-m] [--cached] [<common diff options>] <tree-ish> [<path>…]</pre>
+<pre class="content"><em>git diff-index</em> [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>…]</pre>
<div class="attribution">
</div></div>
</div>
@@ -1861,6 +1861,18 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </p>
</dd>
<dt class="hdlist1">
+-I<regex>
+</dt>
+<dt class="hdlist1">
+--ignore-matching-lines=<regex>
+</dt>
+<dd>
+<p>
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=<lines>
</dt>
<dd>
@@ -2016,7 +2028,17 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </dt>
<dd>
<p>
- do not consider the on-disk file at all
+ Do not consider the on-disk file at all.
+</p>
+</dd>
+<dt class="hdlist1">
+--merge-base
+</dt>
+<dd>
+<p>
+ Instead of comparing <tree-ish> directly, use the merge base
+ between <tree-ish> and HEAD instead. <tree-ish> must be a
+ commit.
</p>
</dd>
<dt class="hdlist1">
@@ -2741,7 +2763,7 @@ always have the special all-zero sha1.</td> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-diff-index.txt b/git-diff-index.txt index f4bd8155c..27acb31cb 100644 --- a/git-diff-index.txt +++ b/git-diff-index.txt @@ -9,7 +9,7 @@ git-diff-index - Compare a tree to the working tree or index SYNOPSIS -------- [verse] -'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...] +'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...] DESCRIPTION ----------- @@ -27,7 +27,12 @@ include::diff-options.txt[] The id of a tree object to diff against. --cached:: - do not consider the on-disk file at all + Do not consider the on-disk file at all. + +--merge-base:: + Instead of comparing <tree-ish> directly, use the merge base + between <tree-ish> and HEAD instead. <tree-ish> must be a + commit. -m:: By default, files recorded in the index but not checked diff --git a/git-diff-tree.html b/git-diff-tree.html index 8d7f6b89b..e9dabadc5 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -750,7 +750,7 @@ git-diff-tree(1) Manual Page <div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
- [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]
+ [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
[<common diff options>] <tree-ish> [<tree-ish>] [<path>…]</pre>
<div class="attribution">
</div></div>
@@ -1862,6 +1862,18 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </p>
</dd>
<dt class="hdlist1">
+-I<regex>
+</dt>
+<dt class="hdlist1">
+--ignore-matching-lines=<regex>
+</dt>
+<dd>
+<p>
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=<lines>
</dt>
<dd>
@@ -2047,6 +2059,16 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </p>
</dd>
<dt class="hdlist1">
+--merge-base
+</dt>
+<dd>
+<p>
+ Instead of comparing the <tree-ish>s directly, use the merge
+ base between the two <tree-ish>s as the "before" side. There
+ must be two <tree-ish>s given and they must both be commits.
+</p>
+</dd>
+<dt class="hdlist1">
--stdin
</dt>
<dd>
@@ -3844,7 +3866,7 @@ the pathname, but if that is <code>NUL</code>, the record will show two paths.</ <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 5c8a2a5e9..2fc24c542 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] - [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] + [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...] DESCRIPTION @@ -43,6 +43,11 @@ include::diff-options.txt[] When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree. +--merge-base:: + Instead of comparing the <tree-ish>s directly, use the merge + base between the two <tree-ish>s as the "before" side. There + must be two <tree-ish>s given and they must both be commits. + --stdin:: When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it diff --git a/git-diff.html b/git-diff.html index 261932ed4..43ae255b3 100644 --- a/git-diff.html +++ b/git-diff.html @@ -750,8 +750,8 @@ git-diff(1) Manual Page <div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git diff</em> [<options>] [<commit>] [--] [<path>…]
-<em>git diff</em> [<options>] --cached [<commit>] [--] [<path>…]
-<em>git diff</em> [<options>] <commit> [<commit>…] <commit> [--] [<path>…]
+<em>git diff</em> [<options>] --cached [--merge-base] [<commit>] [--] [<path>…]
+<em>git diff</em> [<options>] [--merge-base] <commit> [<commit>…] <commit> [--] [<path>…]
<em>git diff</em> [<options>] <commit>…<commit> [--] [<path>…]
<em>git diff</em> [<options>] <blob> <blob>
<em>git diff</em> [<options>] --no-index [--] <path> <path></pre>
@@ -793,7 +793,7 @@ files on disk.</p></div> </p>
</dd>
<dt class="hdlist1">
-<em>git diff</em> [<options>] --cached [<commit>] [--] [<path>…]
+<em>git diff</em> [<options>] --cached [--merge-base] [<commit>] [--] [<path>…]
</dt>
<dd>
<p>
@@ -805,6 +805,9 @@ files on disk.</p></div> <commit> is not given, it shows all staged changes.
--staged is a synonym of --cached.
</p>
+<div class="paragraph"><p>If --merge-base is given, instead of using <commit>, use the merge base
+of <commit> and HEAD. <code>git diff --merge-base A</code> is equivalent to
+<code>git diff $(git merge-base A HEAD)</code>.</p></div>
</dd>
<dt class="hdlist1">
<em>git diff</em> [<options>] <commit> [--] [<path>…]
@@ -819,13 +822,16 @@ files on disk.</p></div> </p>
</dd>
<dt class="hdlist1">
-<em>git diff</em> [<options>] <commit> <commit> [--] [<path>…]
+<em>git diff</em> [<options>] [--merge-base] <commit> <commit> [--] [<path>…]
</dt>
<dd>
<p>
This is to view the changes between two arbitrary
<commit>.
</p>
+<div class="paragraph"><p>If --merge-base is given, use the merge base of the two commits for the
+"before" side. <code>git diff --merge-base A B</code> is equivalent to
+<code>git diff $(git merge-base A B) B</code>.</p></div>
</dd>
<dt class="hdlist1">
<em>git diff</em> [<options>] <commit> <commit>… <commit> [--] [<path>…]
@@ -835,7 +841,7 @@ files on disk.</p></div> This form is to view the results of a merge commit. The first
listed <commit> must be the merge itself; the remaining two or
more commits should be its parents. A convenient way to produce
- the desired set of revisions is to use the ^@ suffix.
+ the desired set of revisions is to use the <code>^@</code> suffix.
For instance, if <code>master</code> names a merge commit, <code>git diff master
master^@</code> gives the same combined diff as <code>git show master</code>.
</p>
@@ -845,7 +851,7 @@ files on disk.</p></div> </dt>
<dd>
<p>
- This is synonymous to the earlier form (without the "..") for
+ This is synonymous to the earlier form (without the <code>..</code>) for
viewing the changes between two arbitrary <commit>. If <commit> on
one side is omitted, it will have the same effect as
using HEAD instead.
@@ -858,21 +864,21 @@ files on disk.</p></div> <p>
This form is to view the changes on the branch containing
and up to the second <commit>, starting at a common ancestor
- of both <commit>. "git diff A...B" is equivalent to
- "git diff $(git merge-base A B) B". You can omit any one
+ of both <commit>. <code>git diff A...B</code> is equivalent to
+ <code>git diff $(git merge-base A B) B</code>. You can omit any one
of <commit>, which has the same effect as using HEAD instead.
</p>
</dd>
</dl></div>
<div class="paragraph"><p>Just in case you are doing something exotic, it should be
noted that all of the <commit> in the above description, except
-in the last two forms that use ".." notations, can be any
-<tree>.</p></div>
+in the <code>--merge-base</code> case and in the last two forms that use <code>..</code>
+notations, can be any <tree>.</p></div>
<div class="paragraph"><p>For a more complete list of ways to spell <commit>, see
"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>.
However, "diff" is about comparing two <em>endpoints</em>, not ranges,
-and the range notations ("<commit>..<commit>" and
-"<commit>...<commit>") do not mean a range as defined in the
+and the range notations (<code><commit>..<commit></code> and
+<code><commit>...<commit></code>) do not mean a range as defined in the
"SPECIFYING RANGES" section in <a href="gitrevisions.html">gitrevisions(7)</a>.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1989,6 +1995,18 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </p>
</dd>
<dt class="hdlist1">
+-I<regex>
+</dt>
+<dt class="hdlist1">
+--ignore-matching-lines=<regex>
+</dt>
+<dd>
+<p>
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=<lines>
</dt>
<dd>
@@ -2792,13 +2810,13 @@ Changes in the working tree not yet staged for the next commit. <li>
<p>
Changes between the index and your last commit; what you
- would be committing if you run "git commit" without "-a" option.
+ would be committing if you run <code>git commit</code> without <code>-a</code> option.
</p>
</li>
<li>
<p>
Changes in the working tree since your last commit; what you
- would be committing if you run "git commit -a"
+ would be committing if you run <code>git commit -a</code>
</p>
</li>
</ol></div>
@@ -2942,7 +2960,7 @@ Output diff in reverse. <div id="footer">
<div id="footer-text">
Last updated
- 2020-07-15 16:50:49 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-diff.txt b/git-diff.txt index 727f24d16..7f4c8a8ce 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -10,8 +10,8 @@ SYNOPSIS -------- [verse] 'git diff' [<options>] [<commit>] [--] [<path>...] -'git diff' [<options>] --cached [<commit>] [--] [<path>...] -'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...] +'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] +'git diff' [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] 'git diff' [<options>] <commit>...<commit> [--] [<path>...] 'git diff' [<options>] <blob> <blob> 'git diff' [<options>] --no-index [--] <path> <path> @@ -40,7 +40,7 @@ files on disk. or when running the command outside a working tree controlled by Git. This form implies `--exit-code`. -'git diff' [<options>] --cached [<commit>] [--] [<path>...]:: +'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]:: This form is to view the changes you staged for the next commit relative to the named <commit>. Typically you @@ -49,6 +49,10 @@ files on disk. If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes. --staged is a synonym of --cached. ++ +If --merge-base is given, instead of using <commit>, use the merge base +of <commit> and HEAD. `git diff --merge-base A` is equivalent to +`git diff $(git merge-base A HEAD)`. 'git diff' [<options>] <commit> [--] [<path>...]:: @@ -58,23 +62,27 @@ files on disk. branch name to compare with the tip of a different branch. -'git diff' [<options>] <commit> <commit> [--] [<path>...]:: +'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]:: This is to view the changes between two arbitrary <commit>. ++ +If --merge-base is given, use the merge base of the two commits for the +"before" side. `git diff --merge-base A B` is equivalent to +`git diff $(git merge-base A B) B`. 'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]:: This form is to view the results of a merge commit. The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents. A convenient way to produce - the desired set of revisions is to use the {caret}@ suffix. + the desired set of revisions is to use the `^@` suffix. For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`. 'git diff' [<options>] <commit>..<commit> [--] [<path>...]:: - This is synonymous to the earlier form (without the "..") for + This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>. If <commit> on one side is omitted, it will have the same effect as using HEAD instead. @@ -83,20 +91,20 @@ files on disk. This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor - of both <commit>. "git diff A\...B" is equivalent to - "git diff $(git merge-base A B) B". You can omit any one + of both <commit>. `git diff A...B` is equivalent to + `git diff $(git merge-base A B) B`. You can omit any one of <commit>, which has the same effect as using HEAD instead. Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except -in the last two forms that use ".." notations, can be any -<tree>. +in the `--merge-base` case and in the last two forms that use `..` +notations, can be any <tree>. For a more complete list of ways to spell <commit>, see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. However, "diff" is about comparing two _endpoints_, not ranges, -and the range notations ("<commit>..<commit>" and -"<commit>\...<commit>") do not mean a range as defined in the +and the range notations (`<commit>..<commit>` and +`<commit>...<commit>`) do not mean a range as defined in the "SPECIFYING RANGES" section in linkgit:gitrevisions[7]. 'git diff' [<options>] <blob> <blob>:: @@ -144,9 +152,9 @@ $ git diff HEAD <3> + <1> Changes in the working tree not yet staged for the next commit. <2> Changes between the index and your last commit; what you - would be committing if you run "git commit" without "-a" option. + would be committing if you run `git commit` without `-a` option. <3> Changes in the working tree since your last commit; what you - would be committing if you run "git commit -a" + would be committing if you run `git commit -a` Comparing with arbitrary commits:: + diff --git a/git-format-patch.html b/git-format-patch.html index cf8431720..ea9c45ec6 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -1436,6 +1436,18 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </p>
</dd>
<dt class="hdlist1">
+-I<regex>
+</dt>
+<dt class="hdlist1">
+--ignore-matching-lines=<regex>
+</dt>
+<dd>
+<p>
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=<lines>
</dt>
<dd>
@@ -1639,7 +1651,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </dt>
<dd>
<p>
- Add <code>Signed-off-by:</code> line to the commit message, using
+ Add a <code>Signed-off-by</code> trailer to the commit message, using
the committer identity of yourself.
See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.
</p>
@@ -2479,7 +2491,7 @@ Extract three topmost commits from the current branch and format them <div id="footer">
<div id="footer-text">
Last updated
- 2020-04-22 14:37:28 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index 0f81d0437..bf1bb40f6 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -119,7 +119,7 @@ include::diff-options.txt[] -s:: --signoff:: - Add `Signed-off-by:` line to the commit message, using + Add a `Signed-off-by` trailer to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information. diff --git a/git-log.html b/git-log.html index f73be1192..a780090bf 100644 --- a/git-log.html +++ b/git-log.html @@ -4506,6 +4506,18 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </p>
</dd>
<dt class="hdlist1">
+-I<regex>
+</dt>
+<dt class="hdlist1">
+--ignore-matching-lines=<regex>
+</dt>
+<dd>
+<p>
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=<lines>
</dt>
<dd>
diff --git a/git-merge.html b/git-merge.html index e92ee4b0e..211904202 100644 --- a/git-merge.html +++ b/git-merge.html @@ -927,14 +927,19 @@ actual commits being merged.</p></div> </dt>
<dd>
<p>
- Add Signed-off-by line by the committer at the end of the commit
- log message. The meaning of a signoff depends on the project,
- but it typically certifies that committer has
- the rights to submit this work under the same license and
- agrees to a Developer Certificate of Origin
- (see <a href="http://developercertificate.org/">http://developercertificate.org/</a> for more information).
-</p>
-<div class="paragraph"><p>With --no-signoff do not add a Signed-off-by line.</p></div>
+ Add a <code>Signed-off-by</code> trailer by the committer at the end of the commit
+ log message. The meaning of a signoff depends on the project
+ to which you’re committing. For example, it may certify that
+ 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 <a href="http://developercertificate.org">http://developercertificate.org</a> 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.
+</p>
+<div class="paragraph"><p>The --no-signoff option can be used to countermand an earlier --signoff
+option on the command line.</p></div>
</dd>
<dt class="hdlist1">
--stat
diff --git a/git-pull.html b/git-pull.html index 91d07fba8..151a6afee 100644 --- a/git-pull.html +++ b/git-pull.html @@ -972,14 +972,19 @@ actual commits being merged.</p></div> </dt>
<dd>
<p>
- Add Signed-off-by line by the committer at the end of the commit
- log message. The meaning of a signoff depends on the project,
- but it typically certifies that committer has
- the rights to submit this work under the same license and
- agrees to a Developer Certificate of Origin
- (see <a href="http://developercertificate.org/">http://developercertificate.org/</a> for more information).
-</p>
-<div class="paragraph"><p>With --no-signoff do not add a Signed-off-by line.</p></div>
+ Add a <code>Signed-off-by</code> trailer by the committer at the end of the commit
+ log message. The meaning of a signoff depends on the project
+ to which you’re committing. For example, it may certify that
+ 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 <a href="http://developercertificate.org">http://developercertificate.org</a> 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.
+</p>
+<div class="paragraph"><p>The --no-signoff option can be used to countermand an earlier --signoff
+option on the command line.</p></div>
</dd>
<dt class="hdlist1">
--stat
diff --git a/git-rebase.html b/git-rebase.html index 8c3b2dc87..f77b3cb84 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1521,7 +1521,7 @@ if the other side had no changes that conflicted.</p></div> </dt>
<dd>
<p>
- Add a Signed-off-by: trailer to all the rebased commits. Note
+ Add a <code>Signed-off-by</code> trailer to all the rebased commits. Note
that if <code>--interactive</code> is given then only commits marked to be
picked, edited or reworded will have the trailer added.
</p>
@@ -2754,7 +2754,7 @@ Use <code>--rebase-merges</code> in such scenarios instead.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-09-03 13:19:53 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-rebase.txt b/git-rebase.txt index 38e15488f..a0487b5cc 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -496,7 +496,7 @@ See also INCOMPATIBLE OPTIONS below. See also INCOMPATIBLE OPTIONS below. --signoff:: - Add a Signed-off-by: trailer to all the rebased commits. Note + Add a `Signed-off-by` trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added. + diff --git a/git-revert.html b/git-revert.html index 40cea9f96..89486b53c 100644 --- a/git-revert.html +++ b/git-revert.html @@ -892,7 +892,7 @@ effect to your index in a row.</p></div> </dt>
<dd>
<p>
- Add Signed-off-by line at the end of the commit message.
+ Add a <code>Signed-off-by</code> trailer at the end of the commit message.
See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.
</p>
</dd>
@@ -1022,7 +1022,7 @@ effect to your index in a row.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-04-22 14:37:28 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-revert.txt b/git-revert.txt index 044276e9d..bb92a4a45 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -99,7 +99,7 @@ effect to your index in a row. -s:: --signoff:: - Add Signed-off-by line at the end of the commit message. + Add a `Signed-off-by` trailer at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information. --strategy=<strategy>:: diff --git a/git-send-email.html b/git-send-email.html index 05b54b8ba..54690c910 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -1229,7 +1229,7 @@ must be used for each option.</p></div> </dt>
<dd>
<p>
- If this is set, add emails found in Signed-off-by: or Cc: lines to the
+ If this is set, add emails found in the <code>Signed-off-by</code> trailer or Cc: lines to the
cc list. Default is the value of <code>sendemail.signedoffbycc</code> configuration
value; if that is unspecified, default to --signed-off-by-cc.
</p>
@@ -1291,7 +1291,7 @@ must be used for each option.</p></div> </li>
<li>
<p>
-<em>sob</em> will avoid including anyone mentioned in Signed-off-by lines except
+<em>sob</em> will avoid including anyone mentioned in the Signed-off-by trailers except
for self (use <em>self</em> for that).
</p>
</li>
@@ -1628,7 +1628,7 @@ Authen::SASL and Mail::Address.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-send-email.txt b/git-send-email.txt index 0a6981014..b7bbbeade 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -313,7 +313,7 @@ Automating the value of `sendemail.identity`. --[no-]signed-off-by-cc:: - If this is set, add emails found in Signed-off-by: or Cc: lines to the + If this is set, add emails found in the `Signed-off-by` trailer or Cc: lines to the cc list. Default is the value of `sendemail.signedoffbycc` configuration value; if that is unspecified, default to --signed-off-by-cc. @@ -340,7 +340,7 @@ Automating except for self (use 'self' for that). - 'bodycc' will avoid including anyone mentioned in Cc lines in the patch body (commit message) except for self (use 'self' for that). -- 'sob' will avoid including anyone mentioned in Signed-off-by lines except +- 'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that). - 'misc-by' will avoid including anyone mentioned in Acked-by, Reviewed-by, Tested-by and other "-by" lines in the patch body, diff --git a/git-show.html b/git-show.html index ea1256d92..73ebb3b1f 100644 --- a/git-show.html +++ b/git-show.html @@ -2972,6 +2972,18 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </p>
</dd>
<dt class="hdlist1">
+-I<regex>
+</dt>
+<dt class="hdlist1">
+--ignore-matching-lines=<regex>
+</dt>
+<dd>
+<p>
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=<lines>
</dt>
<dd>
diff --git a/git-svn.html b/git-svn.html index d3081b422..c1984855a 100644 --- a/git-svn.html +++ b/git-svn.html @@ -1951,7 +1951,7 @@ creating the branch or tag.</p></div> <dd>
<p>
When retrieving svn commits into Git (as part of <em>fetch</em>, <em>rebase</em>, or
- <em>dcommit</em> operations), look for the first <code>From:</code> or <code>Signed-off-by:</code> line
+ <em>dcommit</em> operations), look for the first <code>From:</code> line or <code>Signed-off-by</code> trailer
in the log message and use that as the author string.
</p>
<div class="verseblock">
@@ -1966,7 +1966,7 @@ creating the branch or tag.</p></div> <p>
When committing to svn from Git (as part of <em>set-tree</em> or <em>dcommit</em>
operations), if the existing log message doesn’t already have a
- <code>From:</code> or <code>Signed-off-by:</code> line, append a <code>From:</code> line based on the
+ <code>From:</code> or <code>Signed-off-by</code> trailer, append a <code>From:</code> line based on the
Git commit’s author string. If you use this, then <code>--use-log-author</code>
will retrieve a valid author string for all commits.
</p>
@@ -2517,7 +2517,7 @@ rewinds it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/git-svn.txt b/git-svn.txt index 6624a14fb..67b143cc8 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -701,7 +701,7 @@ creating the branch or tag. --use-log-author:: When retrieving svn commits into Git (as part of 'fetch', 'rebase', or - 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line + 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string. + [verse] @@ -710,7 +710,7 @@ config key: svn.useLogAuthor --add-author-from:: When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a - `From:` or `Signed-off-by:` line, append a `From:` line based on the + `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits. + diff --git a/gitattributes.html b/gitattributes.html index 8896c8dad..373a8e427 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -1571,6 +1571,12 @@ patterns are available:</p></div> </li>
<li>
<p>
+<code>bash</code> suitable for source code in the Bourne-Again SHell language.
+ Covers a superset of POSIX shell function definitions.
+</p>
+</li>
+<li>
+<p>
<code>bibtex</code> suitable for files with BibTeX coded references.
</p>
</li>
@@ -2175,7 +2181,7 @@ frotz unspecified</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-05-08 15:24:24 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/gitattributes.txt b/gitattributes.txt index 2d0a03715..e84e104f9 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -802,6 +802,9 @@ patterns are available: - `ada` suitable for source code in the Ada language. +- `bash` suitable for source code in the Bourne-Again SHell language. + Covers a superset of POSIX shell function definitions. + - `bibtex` suitable for files with BibTeX coded references. - `cpp` suitable for source code in the C and C++ languages. diff --git a/githooks.html b/githooks.html index 9264d2e39..a5867f3ec 100644 --- a/githooks.html +++ b/githooks.html @@ -876,7 +876,7 @@ to normalize the message into some project standard format. It can also be used to refuse the commit after inspecting the message
file.</p></div>
<div class="paragraph"><p>The default <em>commit-msg</em> hook, when enabled, detects duplicate
-"Signed-off-by" lines, and aborts the commit if one is found.</p></div>
+<code>Signed-off-by</code> trailers, and aborts the commit if one is found.</p></div>
</div>
<div class="sect2">
<h3 id="_post_commit">post-commit</h3>
@@ -1369,7 +1369,7 @@ running passing "1", "1" should not be possible.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-09-25 15:47:14 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>
diff --git a/githooks.txt b/githooks.txt index 6e461ace6..4e097dc4e 100644 --- a/githooks.txt +++ b/githooks.txt @@ -164,7 +164,7 @@ can also be used to refuse the commit after inspecting the message file. The default 'commit-msg' hook, when enabled, detects duplicate -"Signed-off-by" lines, and aborts the commit if one is found. +`Signed-off-by` trailers, and aborts the commit if one is found. post-commit ~~~~~~~~~~~ diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 6910b091d..8468a149d 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:53 PDT
+ 2020-11-02 14:03:15 PST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index dcf422e93..a769b58c6 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:53 PDT
+ 2020-11-02 14:03:15 PST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index 89a3b52ab..51365ffe8 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:48 PDT
+ 2020-11-02 14:03:11 PST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 6de2b5c36..340082101 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:52 PDT
+ 2020-11-02 14:03:14 PST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 87120b002..f9ea5742b 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:52 PDT
+ 2020-11-02 14:03:14 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 88c2af235..894d6b315 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:52 PDT
+ 2020-11-02 14:03:14 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 94555b299..bfda1ad2a 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1189,7 +1189,7 @@ int main(int argc, char **argv) <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:52 PDT
+ 2020-11-02 14:03:14 PST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 06a44816b..4e43f0d0c 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2 <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:51 PDT
+ 2020-11-02 14:03:13 PST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 251bd5fe4..0027702a9 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:49 PDT
+ 2020-11-02 14:03:11 PST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 8c7a64cf1..eafd189da 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master"</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:51 PDT
+ 2020-11-02 14:03:13 PST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 46e52d2a7..92b250332 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:50 PDT
+ 2020-11-02 14:03:13 PST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index d9ac1e8f0..1455e793c 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:50 PDT
+ 2020-11-02 14:03:12 PST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 33f31faf2..0f950a135 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:50 PDT
+ 2020-11-02 14:03:12 PST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 84bdb0400..bc0543f59 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:49 PDT
+ 2020-11-02 14:03:12 PST
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 567df3390..83edcdd58 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -952,7 +952,7 @@ as part of the merge commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-29 15:15:49 PDT
+ 2020-11-02 14:03:12 PST
</div>
</div>
</body>
diff --git a/merge-options.txt b/merge-options.txt index 80d483166..eb0aabd39 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -77,16 +77,7 @@ When not possible, refuse to merge and exit with a non-zero status. With --no-log do not list one-line descriptions from the actual commits being merged. ---signoff:: ---no-signoff:: - Add Signed-off-by line by the committer at the end of the commit - log message. The meaning of a signoff depends on the project, - but it typically certifies that committer has - the rights to submit this work under the same license and - agrees to a Developer Certificate of Origin - (see http://developercertificate.org/ for more information). -+ -With --no-signoff do not add a Signed-off-by line. +include::signoff-option.txt[] --stat:: -n:: diff --git a/signoff-option.txt b/signoff-option.txt new file mode 100644 index 000000000..12aa2333e --- /dev/null +++ b/signoff-option.txt @@ -0,0 +1,18 @@ +ifdef::git-commit[] +-s:: +endif::git-commit[] +--signoff:: +--no-signoff:: + Add a `Signed-off-by` trailer by the committer at the end of the commit + log message. The meaning of a signoff depends on the project + to which you're committing. For example, it may certify that + 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 + 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. ++ +The --no-signoff option can be used to countermand an earlier --signoff +option on the command line. |