diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:26:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:26:02 -0700 |
| commit | 02273fdbd07ddaa13a232db0ae63a720c4a013f0 (patch) | |
| tree | 714a6c735a550296c9edd073129d327feb7c87ce /Documentation | |
| parent | c8a140fee4e7df83b7eb781e436b88b067f149d1 (diff) | |
| parent | 6232b3438d127def8cc0612e45422347578c6102 (diff) | |
| download | git-02273fdbd07ddaa13a232db0ae63a720c4a013f0.tar.gz git-02273fdbd07ddaa13a232db0ae63a720c4a013f0.tar.xz | |
Merge branch 'jc/revert-merge'
* jc/revert-merge:
cherry-pick/revert -m: add tests
revert/cherry-pick: work on merge commits as well
Conflicts:
builtin-revert.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 9 | ||||
| -rw-r--r-- | Documentation/git-revert.txt | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 76a2edfd9..937c4a792 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit SYNOPSIS -------- -'git-cherry-pick' [--edit] [-n] [-x] <commit> +'git-cherry-pick' [--edit] [-n] [-m parent-number] [-x] <commit> DESCRIPTION ----------- @@ -44,6 +44,13 @@ OPTIONS described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op. +-m parent-number|--mainline parent-number:: + Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows cherry-pick to replay the change + relative to the specified parent. + -n|--no-commit:: Usually the command automatically creates a commit with a commit log message stating which commit was diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index 69db49844..3457c4078 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -7,7 +7,7 @@ git-revert - Revert an existing commit SYNOPSIS -------- -'git-revert' [--edit | --no-edit] [-n] <commit> +'git-revert' [--edit | --no-edit] [-n] [-m parent-number] <commit> DESCRIPTION ----------- @@ -27,6 +27,13 @@ OPTIONS message prior committing the revert. This is the default if you run the command from a terminal. +-m parent-number|--mainline parent-number:: + Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows revert to reverse the change + relative to the specified parent. + --no-edit:: With this option, `git-revert` will not start the commit message editor. |