diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-10-23 01:23:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-10-23 01:23:31 +0000 |
| commit | 764a667a8f360cfaafc6bfa9a0b5a2f09ed47586 (patch) | |
| tree | fc6f7da163a804cc8aef905924828d69b897399a /git-cherry-pick.html | |
| parent | ea719cf8b709e1b5c43d18ca26832f8c9bf11e7e (diff) | |
| download | git-htmldocs-764a667a8f360cfaafc6bfa9a0b5a2f09ed47586.tar.gz | |
Autogenerated HTML docs for v1.5.3.4-319-gdd817
Diffstat (limited to 'git-cherry-pick.html')
| -rw-r--r-- | git-cherry-pick.html | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 27ee353e7..3e510498e 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -307,11 +307,12 @@ modifications from the HEAD commit).</p> </dt>
<dd>
<p>
- Cause the command to append which commit was
- cherry-picked after the original commit message when
- making a commit. Do not use this option if you are
- cherry-picking from your private branch because the
- information is useless to the recipient. If on the
+ When recording the commit, append to the original commit
+ message a note that indicates which commit this change
+ was cherry-picked from. Append the note only for cherry
+ picks without conflicts. Do not use this option if
+ you are cherry-picking from your private branch because
+ the information is useless to the recipient. If on the
other hand you are cherry-picking between two publicly
visible branches (e.g. backporting a fix to a
maintenance branch for an older release from a
@@ -362,7 +363,7 @@ effect to your working tree in a row.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Jul-2007 02:09:33 UTC
+Last updated 23-Oct-2007 01:21:45 UTC
</div>
</div>
</body>
|