diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 17:25:34 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 17:25:34 +0900 |
| commit | 96153bf70f5b69b8c480445c9aed3782ef6776a3 (patch) | |
| tree | e0081b96a5c6731fbb3f2bccce0be798a33c2201 /git-rebase.html | |
| parent | bbb584b1065a684f3ce95ab24b609bd800e6cae1 (diff) | |
| download | git-htmldocs-96153bf70f5b69b8c480445c9aed3782ef6776a3.tar.gz | |
Autogenerated HTML docs for v2.17.0-391-g1f1cd
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/git-rebase.html b/git-rebase.html index ce85adddb..b8fddc7c1 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1,9 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.10" />
<title>git-rebase(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -1325,9 +1326,10 @@ default is <code>--no-fork-point</code>, otherwise the default is <code>--fork-p </dt>
<dd>
<p>
- This flag is passed to <em>git am</em> to sign off all the rebased
- commits (see <a href="git-am.html">git-am(1)</a>). Incompatible with the
- --interactive option.
+ Add a Signed-off-by: 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. Incompatible
+ with the <code>--preserve-merges</code> option.
</p>
</dd>
<dt class="hdlist1">
@@ -2106,7 +2108,7 @@ reorder commits tend to produce counterintuitive results.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-03-06 15:25:02 PST
+ 2018-04-25 17:24:48 JST
</div>
</div>
</body>
|