1
0
mirror of https://github.com/git/git.git synced 2024-11-18 19:13:58 +01:00

Document "git cherry-pick" and "git revert"

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-08-28 03:01:09 -07:00
parent e47e35acdd
commit de2b82c65d
3 changed files with 75 additions and 1 deletions

@ -0,0 +1,57 @@
git-cherry-pick-script(1)
=========================
v0.99.5 Aug 2005
NAME
----
git-cherry-pick-script - Apply the change introduced by an existing commit.
SYNOPSIS
--------
'git-cherry-pick-script' [-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 link:git.html[git] suite

@ -7,7 +7,7 @@ git-revert-script - Revert an existing commit.
SYNOPSIS
--------
'git-revert-script' <commit>
'git-revert-script' [-n] <commit>
DESCRIPTION
-----------
@ -20,6 +20,20 @@ OPTIONS
<commit>::
Commit to revert.
-n::
Usually the command automatically creates a commit with
a commit log message stating which commit was reverted.
This flag applies the change necessary to revert 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 revert is done against the beginning state of your
working tree.
This is useful when reverting more than one commits'
effect to your working tree in a row.
Author
------
Written by Junio C Hamano <junkio@cox.net>

@ -198,6 +198,9 @@ Porcelain-ish Commands
link:git-revert-script.html[git-revert-script]::
Revert an existing commit.
link:git-cherry-pick-script.html[git-cherry-pick-script]::
Cherry-pick the effect of an existing commit.
link:git-rebase-script.html[git-rebase-script]::
Rebase local commits to new upstream head.