diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-10 01:18:12 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-10 01:18:12 +0000 |
| commit | a8cc1d89becb271f194a70827ae548d577d57c1e (patch) | |
| tree | 7eabc4dac68221fec320185b92fa2e47e6e31ab1 /git-commit.html | |
| parent | c5be4cc1f482f43e73d5d1289ca5e4ab3cc0b9fd (diff) | |
| download | git-htmldocs-a8cc1d89becb271f194a70827ae548d577d57c1e.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-225-g83c3c
Diffstat (limited to 'git-commit.html')
| -rw-r--r-- | git-commit.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-commit.html b/git-commit.html index a3f106943..2ee36c7c0 100644 --- a/git-commit.html +++ b/git-commit.html @@ -542,9 +542,10 @@ that, you can recover from it with <em>git reset</em>.</p></div> </dt>
<dd>
<p>
- When used with -C/-c/--amend options, declare that the
- authorship of the resulting commit now belongs of the committer.
- This also renews the author timestamp.
+ When used with -C/-c/--amend options, or when committing after a
+ a conflicting cherry-pick, declare that the authorship of the
+ resulting commit now belongs of the committer. This also renews
+ the author timestamp.
</p>
</dd>
<dt class="hdlist1">
@@ -1123,7 +1124,7 @@ Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>>< </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-02-22 07:51:12 UTC
+Last updated 2011-03-10 01:17:52 UTC
</div>
</div>
</body>
|