diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-29 21:22:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-29 21:22:31 -0800 |
| commit | df4a824341f34b1d2d890ce3e9dd7f6df6475953 (patch) | |
| tree | 39260cf419b5f6f71cbfd39a4fa508a5ed0122cd /Documentation | |
| parent | c6fef0bbea485ff8aec979177ee5c1c568fffc55 (diff) | |
| parent | 84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c (diff) | |
| download | git-df4a824341f34b1d2d890ce3e9dd7f6df6475953.tar.gz git-df4a824341f34b1d2d890ce3e9dd7f6df6475953.tar.xz | |
Merge branch 'maint'
* maint:
Documentation cherry-pick: Fix cut-and-paste error
git.el: find the git-status buffer whatever its name is
git-gui: Paper bag fix info dialog when no files are staged at commit
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 877ab66ef..f0beb412e 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -45,7 +45,7 @@ OPTIONS 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 + Usually you cannot cherry-pick 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 |