mirror of
https://github.com/git/git.git
synced 2024-11-17 22:44:49 +01:00
df8baa42fe
The fixes focuses on improving the HTML output. Most noteworthy: - Fix the Makefile to also make various *.html files depend on included files. - Consistently use 'NOTE: ...' instead of '[ ... ]' for additional info. - Fix ending '::' for description lists in OPTION section etc. - Fix paragraphs in description lists ending up as preformated text. - Always use listingblocks (preformatted text wrapped in lines with -----) for examples that span empty lines, so they are put in only one HTML block. - Use '1.' instead of '(1)' for numbered lists. - Fix linking to other GIT docs. - git-rev-list.txt: put option descriptions in an OPTION section. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
57 lines
1.5 KiB
Text
57 lines
1.5 KiB
Text
git-cherry-pick(1)
|
|
==================
|
|
v0.99.5 Aug 2005
|
|
|
|
NAME
|
|
----
|
|
git-cherry-pick - Apply the change introduced by an existing commit.
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-cherry-pick' [-n] [-r] <commit>
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Given one existing commit, apply the change the patch introduces, and record a
|
|
new commit that records it. This requires your working tree to be clean (no
|
|
modifications from the HEAD commit).
|
|
|
|
OPTIONS
|
|
-------
|
|
<commit>::
|
|
Commit to cherry-pick.
|
|
|
|
-r::
|
|
Usuall the command appends which commit was
|
|
cherry-picked after the original commit message when
|
|
making a commit. This option, '--replay', causes it to
|
|
use the original commit message intact. This is useful
|
|
when you are reordering the patches in your private tree
|
|
before publishing, and is used by 'git rebase'.
|
|
|
|
-n::
|
|
Usually the command automatically creates a commit with
|
|
a commit log message stating which commit was
|
|
cherry-picked. This flag applies the change necessary
|
|
to cherry-pick the named commit to your working tree,
|
|
but does not make the commit. In addition, when this
|
|
option is used, your working tree does not have to match
|
|
the HEAD commit. The cherry-pick is done against the
|
|
beginning state of your working tree.
|
|
+
|
|
This is useful when cherry-picking more than one commits'
|
|
effect to your working tree in a row.
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Junio C Hamano <junkio@cox.net>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the gitlink:git[7] suite
|
|
|