summaryrefslogtreecommitdiff
path: root/builtin-repo-config.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-14 22:00:02 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-14 22:00:34 -0800
commitacb4441e0dabaaa666ecae11fdafc27c3691e763 (patch)
tree817c8d77b06c1561672221b90800de115b171bc0 /builtin-repo-config.c
parent5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1 (diff)
downloadgit-acb4441e0dabaaa666ecae11fdafc27c3691e763.tar.gz
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>
Diffstat (limited to 'builtin-repo-config.c')
0 files changed, 0 insertions, 0 deletions