diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-30 18:55:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 18:55:39 (GMT) |
| commit | 01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b (patch) | |
| tree | 8df2b7b5111d783da4acad2d304341e108889ca3 /Documentation | |
| parent | a76b2084fb9c7e788108717fdce4c91227808980 (diff) | |
| parent | e0ef8495e98ae5ae796ec23bf438eef413557193 (diff) | |
| download | git-01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b.zip git-01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b.tar.gz git-01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b.tar.bz2 | |
Merge branch 'cc/cherry-pick-stdin'
* cc/cherry-pick-stdin:
revert: do not rebuild argv on heap
revert: accept arbitrary rev-list options
t3508 (cherry-pick): futureproof against unmerged files
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index bcb4c75..ca485db 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -113,6 +113,13 @@ git cherry-pick --ff ..next:: 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:: + + Apply the changes introduced by all commits on the master + branch that touched README to the working tree and index, + so the result can be inspected and made into a single new + commit if suitable. + Author ------ Written by Junio C Hamano <gitster@pobox.com> |