diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:51:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:51:45 -0700 |
| commit | d274fc093cbdcddbf9aff5f79de4e9445f3363d7 (patch) | |
| tree | 0abf168a8760bee8686a8836b4b29a366eab0118 /Documentation/git-cherry-pick.txt | |
| parent | Merge branch 'nd/i18n' (diff) | |
| parent | docs: stop using asciidoc no-inline-literal (diff) | |
| download | tgif-d274fc093cbdcddbf9aff5f79de4e9445f3363d7.tar.xz | |
Merge branch 'jk/doc-asciidoc-inline-literal'
Our documentation was written for an ancient version of AsciiDoc,
making the source not very readable.
By Jeff King
* jk/doc-asciidoc-inline-literal:
docs: stop using asciidoc no-inline-literal
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 3d25a20b67..9f3dae631e 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -149,7 +149,7 @@ EXAMPLES Apply the changes introduced by all commits that are ancestors of master but not of HEAD to produce new commits. -`git cherry-pick master{tilde}4 master{tilde}2`:: +`git cherry-pick master~4 master~2`:: Apply the changes introduced by the fifth and third last commits pointed to by master and create 2 new commits with @@ -170,7 +170,7 @@ EXAMPLES are in next but not HEAD to the current branch, creating a new commit for each new change. -`git rev-list --reverse master \-- README | git cherry-pick -n --stdin`:: +`git rev-list --reverse master -- README | git cherry-pick -n --stdin`:: Apply the changes introduced by all commits on the master branch that touched README to the working tree and index, |