projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5fe3acc) | patch
Use merge-recursive in git-revert/git-cherry-pick
authorJunio C Hamano <junkio@cox.net>
Mon, 15 Jan 2007 06:00:02 +0000 (22:00 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 Jan 2007 06:00:34 +0000 (22:00 -0800)
commitacb4441e0dabaaa666ecae11fdafc27c3691e763
tree817c8d77b06c1561672221b90800de115b171bc0tree | snapshot
parent5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1commit | diff
Use merge-recursive in git-revert/git-cherry-pick

This makes revert and cherry-pick to use merge-recursive, to
allow them to notice renames.  A pair of test scripts
demonstrate that an old change before a rename happened can be
applied (reverted) after a rename with cherry-pick (with revert).

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-revert.sh diff | blob | history
t/t3501-revert-cherry-pick.sh [new file with mode: 0755] blob
Git—the stupid content tracker