diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-05-05 01:30:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-05-05 01:30:38 +0000 |
| commit | b77f819e3fe08db387897135c3813e2cfebac86b (patch) | |
| tree | 4b42e3084a3377be27f037a63c570d708f21f4b7 /git-cherry-pick.html | |
| parent | 600334628294fbcd6406b55a9a17d270371cb7e5 (diff) | |
| download | git-htmldocs-b77f819e3fe08db387897135c3813e2cfebac86b.tar.gz | |
Autogenerated HTML docs for v1.7.5.1-169-g505a1
Diffstat (limited to 'git-cherry-pick.html')
| -rw-r--r-- | git-cherry-pick.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 370598c67..1ce6800be 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -493,9 +493,10 @@ conflicts.</p></div> </dt>
<dd>
<p>
- 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
+ When recording the commit, append a line that says
+ "(cherry picked from commit …)" to the original commit
+ message in order to indicate which commit this change was
+ cherry-picked from. This is done 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
@@ -714,7 +715,7 @@ context lines. </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:13 UTC
+Last updated 2011-05-05 01:29:54 UTC
</div>
</div>
</body>
|