summaryrefslogtreecommitdiffstats
path: root/git-commit.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-10-20 05:42:33 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-10-20 05:42:33 +0000
commit7d06a8aba96d4197610b089a0862b46d84a36f53 (patch)
tree32010c51081107cd4c7b54fb59b212abdd429fcd /git-commit.html
parenta2deec5920d1cc24a58ea6af6f0f7d36dedd0f7d (diff)
downloadgit-htmldocs-7d06a8aba96d4197610b089a0862b46d84a36f53.tar.gz
Autogenerated HTML docs for v1.6.0.2-588-g3102
Diffstat (limited to 'git-commit.html')
-rw-r--r--git-commit.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/git-commit.html b/git-commit.html
index e90de3089..bae4d4ac4 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -474,7 +474,8 @@ that, you can recover from it with <em>git-reset</em>.</p></div>
</dt>
<dd>
<p>
- Add Signed-off-by line at the end of the commit message.
+ Add Signed-off-by line by the commiter at the end of the commit
+ log message.
</p>
</dd>
<dt>
@@ -552,6 +553,9 @@ that, you can recover from it with <em>git-reset</em>.</p></div>
</tt></pre>
</div></div>
<div class="para"><p>but can be used to amend a merge commit.</p></div>
+<div class="para"><p>You should understand the implications of rewriting history if you
+amend a commit that has already been published. (See the "RECOVERING
+FROM UPSTREAM REBASE" section in <a href="git-rebase.html">git-rebase(1)</a>.)</p></div>
</dd>
<dt>
-i
@@ -863,7 +867,7 @@ Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-19 06:32:46 UTC
+Last updated 2008-10-20 05:41:58 UTC
</div>
</div>
</body>